Skip to content

Commit 2dcd1ff

Browse files
committed
fix CI
1 parent 70aa544 commit 2dcd1ff

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/ubuntu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
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
4040

4141
- name: Build gf
42-
run: cmake --build ${{ github.workspace }}/build --config ${{ env.BUILD_TYPE }} --parallel
42+
run: cmake --build ${{ github.workspace }}/build --config ${{ matrix.configurations.mode }} --parallel
4343

4444
- name: Run tests
4545
working-directory: ${{ github.workspace }}/build
46-
run: ctest -C ${{ env.BUILD_TYPE }} -T test --output-on-failure
46+
run: ctest -C ${{ matrix.configurations.mode }} -T test --output-on-failure

.github/workflows/windows.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,18 @@ jobs:
6161
- name: Configure gf
6262
shell: cmd
6363
run: |
64-
set PATH=%PATH%;${{github.workspace}}/gf/build/library/${{ env.BUILD_TYPE }}
64+
set PATH=%PATH%;${{github.workspace}}/gf/build/library/${{ matrix.configurations.mode }}
6565
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
6666
6767
- name: Build gf
6868
shell: cmd
6969
run: |
70-
set PATH=%PATH%;${{github.workspace}}/gf/build/library/${{ env.BUILD_TYPE }}
71-
cmake --build ${{ github.workspace }}/gf/build --config ${{ env.BUILD_TYPE }} --parallel
70+
set PATH=%PATH%;${{github.workspace}}/gf/build/library/${{ matrix.configurations.mode }}
71+
cmake --build ${{ github.workspace }}/gf/build --config ${{ matrix.configurations.mode }} --parallel
7272
7373
- name: Run tests
7474
shell: cmd
7575
working-directory: ${{ github.workspace }}/gf/build
7676
run: |
77-
set PATH=%PATH%;${{github.workspace}}/gf/build/library/${{ env.BUILD_TYPE }}
78-
ctest -C ${{ env.BUILD_TYPE }} --output-on-failure
77+
set PATH=%PATH%;${{github.workspace}}/gf/build/library/${{ matrix.configurations.mode }}
78+
ctest -C ${{ matrix.configurations.mode }} --output-on-failure

xmake.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ target("gf0")
6464
add_includedirs("include-priv")
6565
add_includedirs("$(buildir)/config")
6666
add_includedirs("library/vendor/glad/gles20/include")
67-
add_packages("opengl-headers", "libsdl", "freetype")
67+
add_packages("opengl-headers", "libsdl", "freetype", "pugixml")
6868
add_deps("gfcore0")
6969
set_license("Zlib")
7070

0 commit comments

Comments
 (0)