fix CI

GamedevFramework · Jan 30, 2025 · 2dcd1ff · 2dcd1ff
1 parent 70aa544
commit 2dcd1ff
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -39,8 +39,8 @@ jobs:
         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
 
       - name: Build gf
-        run: cmake --build ${{ github.workspace }}/build --config ${{ env.BUILD_TYPE }} --parallel
+        run: cmake --build ${{ github.workspace }}/build --config ${{ matrix.configurations.mode }} --parallel
 
       - name: Run tests
         working-directory: ${{ github.workspace }}/build
-        run: ctest -C ${{ env.BUILD_TYPE }} -T test --output-on-failure
+        run: ctest -C ${{ matrix.configurations.mode }} -T test --output-on-failure
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -61,18 +61,18 @@ jobs:
       - name: Configure gf
         shell: cmd
         run: |
-          set PATH=%PATH%;${{github.workspace}}/gf/build/library/${{ env.BUILD_TYPE }}
+          set PATH=%PATH%;${{github.workspace}}/gf/build/library/${{ matrix.configurations.mode }}
           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
 
       - name: Build gf
         shell: cmd
         run: |
-          set PATH=%PATH%;${{github.workspace}}/gf/build/library/${{ env.BUILD_TYPE }}
-          cmake --build ${{ github.workspace }}/gf/build --config ${{ env.BUILD_TYPE }} --parallel
+          set PATH=%PATH%;${{github.workspace}}/gf/build/library/${{ matrix.configurations.mode }}
+          cmake --build ${{ github.workspace }}/gf/build --config ${{ matrix.configurations.mode }} --parallel
 
       - name: Run tests
         shell: cmd
         working-directory: ${{ github.workspace }}/gf/build
         run: |
-          set PATH=%PATH%;${{github.workspace}}/gf/build/library/${{ env.BUILD_TYPE }}
-          ctest -C ${{ env.BUILD_TYPE }} --output-on-failure
+          set PATH=%PATH%;${{github.workspace}}/gf/build/library/${{ matrix.configurations.mode }}
+          ctest -C ${{ matrix.configurations.mode }} --output-on-failure
diff --git a/xmake.lua b/xmake.lua
@@ -64,7 +64,7 @@ target("gf0")
     add_includedirs("include-priv")
     add_includedirs("$(buildir)/config")
     add_includedirs("library/vendor/glad/gles20/include")
-    add_packages("opengl-headers", "libsdl", "freetype")
+    add_packages("opengl-headers", "libsdl", "freetype", "pugixml")
     add_deps("gfcore0")
     set_license("Zlib")