Skip to content

Commit 70aa544

Browse files
committed
improve CI
1 parent f27e684 commit 70aa544

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

.github/workflows/ubuntu.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,15 @@ on:
66
pull_request:
77
branches: [ master, develop ]
88

9-
env:
10-
BUILD_TYPE: Release
11-
129
jobs:
1310
build:
1411
strategy:
1512
fail-fast: false
1613
matrix:
1714
configurations:
18-
- { name: Linux, shared: ON, mode: Debug }
19-
- { name: Linux, shared: ON, mode: Release }
20-
- { name: Linux, shared: OFF, mode: Debug }
15+
- { name: Linux, shared: "ON", mode: Debug }
16+
- { name: Linux, shared: "ON", mode: Release }
17+
- { name: Linux, shared: "OFF", mode: Debug }
2118

2219
name: Linux (${{ matrix.configurations.kind }} ${{ matrix.configurations.mode }})
2320
runs-on: ubuntu-latest
@@ -39,7 +36,7 @@ jobs:
3936
ref: ${{ steps.extract_branch.outputs.branch }}
4037

4138
- name: Configure gf
42-
run: cmake -DBUILD_SHARED_LIBS=${{ matrix.configurations.shared }} -DCMAKE_BUILD_TYPE=${{ matrix.configurations.mode }} -DGF_BUILD_GAMES=OFF -DGF_BUILD_EXAMPLES=OFF -DGF_BUILD_DOCUMENTATION=OFF -DCMAKE_UNITY_BUILD=ON -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -S ${{ github.workspace }} -B ${{ github.workspace }}/build
39+
run: cmake -DBUILD_SHARED_LIBS=${{ matrix.configurations.shared }} -DCMAKE_BUILD_TYPE=${{ matrix.configurations.mode }} -DGF_BUILD_GAMES=OFF -DGF_BUILD_EXAMPLES=OFF -DGF_BUILD_DOCUMENTATION=OFF -DCMAKE_UNITY_BUILD=ON -S ${{ github.workspace }} -B ${{ github.workspace }}/build
4340

4441
- name: Build gf
4542
run: cmake --build ${{ github.workspace }}/build --config ${{ env.BUILD_TYPE }} --parallel

.github/workflows/windows.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ on:
77
branches: [ master, develop ]
88

99
env:
10-
BUILD_TYPE: Release
1110
VCPKG_COMMIT: 6f29f12e82a8293156836ad81cc9bf5af41fe836
1211
VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}\vcpkg\binary-cache
1312

@@ -17,9 +16,9 @@ jobs:
1716
fail-fast: false
1817
matrix:
1918
configurations:
20-
- { name: Windows, shared: ON, mode: Debug }
21-
- { name: Windows, shared: ON, mode: Release }
22-
- { name: Windows, shared: OFF, mode: Debug }
19+
- { name: Windows, shared: "ON", mode: Debug }
20+
- { name: Windows, shared: "ON", mode: Release }
21+
- { name: Windows, shared: "OFF", mode: Debug }
2322

2423
name: Windows (${{ matrix.configurations.kind }} ${{ matrix.configurations.mode }})
2524
runs-on: windows-latest
@@ -63,7 +62,7 @@ jobs:
6362
shell: cmd
6463
run: |
6564
set PATH=%PATH%;${{github.workspace}}/gf/build/library/${{ env.BUILD_TYPE }}
66-
cmake -DBUILD_SHARED_LIBS=${{ matrix.configurations.shared }} -DCMAKE_BUILD_TYPE=${{ matrix.configurations.mode }} -DGF_BUILD_GAMES=OFF -DGF_BUILD_EXAMPLES=OFF -DGF_BUILD_DOCUMENTATION=OFF -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/vcpkg/scripts/buildsystems/vcpkg.cmake -S ${{ github.workspace }}/gf -B ${{ github.workspace }}/gf/build
65+
cmake -DBUILD_SHARED_LIBS=${{ matrix.configurations.shared }} -DCMAKE_BUILD_TYPE=${{ matrix.configurations.mode }} -DGF_BUILD_GAMES=OFF -DGF_BUILD_EXAMPLES=OFF -DGF_BUILD_DOCUMENTATION=OFF -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/vcpkg/scripts/buildsystems/vcpkg.cmake -S ${{ github.workspace }}/gf -B ${{ github.workspace }}/gf/build
6766
6867
- name: Build gf
6968
shell: cmd

.github/workflows/xmake.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: XMakeBuild
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [ master, develop ]
66
pull_request:
7-
branches: [ main ]
7+
branches: [ master, develop ]
88

99
jobs:
1010
build:

0 commit comments

Comments
 (0)