Skip to content

Commit ff06584

Browse files
committed
Prepare for release version 2.1.0.
修改: .github/workflows/build.yml 修改: .github/workflows/test.yml 修改: ChangeLog
1 parent 75319e7 commit ff06584

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,13 @@ jobs:
127127
export C_COMPILER="gcc"
128128
export CXX_COMPILER="g++"
129129
export LINKER="ld"
130-
export CC="/usr/bin/${{ matrix.arch }}-$C_COMPILER"
131-
export CXX="/usr/bin/${{ matrix.arch }}-$CXX_COMPILER"
130+
export CC_CROSS="/usr/bin/${{ matrix.arch }}-$C_COMPILER"
131+
export CXX_CROSS="/usr/bin/${{ matrix.arch }}-$CXX_COMPILER"
132132
export LD="/usr/bin/${{ matrix.arch }}-$LINKER"
133133
134134
mkdir build
135135
cd build
136-
cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.srcdir }}/${{ env.pkgname }}-${{ matrix.arch }} -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX -DCMAKE_LINKER=$LD
136+
cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.srcdir }}/${{ env.pkgname }}-${{ matrix.arch }} -DCMAKE_C_COMPILER=$CC_CROSS -DCMAKE_CXX_COMPILER=$CXX_CROSS -DCMAKE_LINKER=$LD
137137
cmake --build . --config=Release
138138
cmake --install .
139139
cd ..
@@ -175,6 +175,10 @@ jobs:
175175
steps:
176176

177177
#--------------------------------------------collect--------------------------------------------
178+
- uses: maxim-lobanov/setup-xcode@v1
179+
with:
180+
xcode-version: latest-stable
181+
178182
- name: 🏷️ Get infomations
179183
run: |
180184
tag="${GITHUB_REF#refs/tags/}"
@@ -200,12 +204,12 @@ jobs:
200204
201205
- name: 🛠️ Build binary distribution
202206
run: |
203-
export CC="clang"
204-
export CXX="clang++"
207+
export CC_CROSS="clang"
208+
export CXX_CROSS="clang++"
205209
206210
mkdir build
207211
cd build
208-
cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.srcdir }}/${{ env.pkgname }}-${{ matrix.arch }}-darwin-apple -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -arch ${{ matrix.arch }}" -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -arch ${{ matrix.arch }}"
212+
cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.srcdir }}/${{ env.pkgname }}-${{ matrix.arch }}-darwin-apple -DCMAKE_C_COMPILER=$CC_CROSS -DCMAKE_CXX_COMPILER=$CXX_CROSS -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -arch ${{ matrix.arch }}" -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -arch ${{ matrix.arch }}"
209213
cmake --build . --config=Release
210214
cmake --install .
211215
cd ..

.github/workflows/test.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ jobs:
1515
steps:
1616
#--------------------------------------------collect--------------------------------------------
1717
- uses: actions/checkout@v3
18+
19+
- name: 🧰 Setup Python
20+
uses: actions/setup-python@v4
1821

1922
- name: 📁 Collect dependencies
2023
run: |
@@ -31,16 +34,16 @@ jobs:
3134
mkdir -p build
3235
cd build
3336
cmake .. -DENABLE_EXTRA=ON -DENABLE_TEST=ON
34-
cmake --build .
37+
cmake --build . --config=Release
3538
cd ..
3639
3740
#--------------------------------------------test--------------------------------------------
3841
- name: ✔️ Test
3942
run : |
4043
cd build
41-
ctest --verbose
44+
ctest --verbose -C Release
4245
cd ..
43-
46+
4447
test-macos:
4548

4649
runs-on: macos-latest
@@ -63,12 +66,12 @@ jobs:
6366
mkdir build
6467
cd build
6568
cmake .. -DENABLE_EXTRA=ON -DENABLE_TEST=ON
66-
cmake --build .
69+
cmake --build . --config=Release
6770
cd ..
6871
6972
#--------------------------------------------test--------------------------------------------
7073
- name: ✔️ Test
7174
run : |
7275
cd build
73-
ctest --verbose
76+
ctest --verbose -C Release
7477
cd ..

ChangeLog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
Move generated files to C++ to avoid 'register' warnings.
88
Add test and clean target in 'Makefile.devel'.
99
Update 'FILELIST'.
10+
Update GitHub Action for build and test.
11+
Prepare for release version 2.1.0.
1012

1113
2023-09-09 ChenPi11 <wushengwuxi-msctinoulk@outlook.com>
1214

0 commit comments

Comments
 (0)