update CI, Python 3.13, Ninja

moritz-h · Oct 23, 2024 · 91c0283 · 91c0283
1 parent 1f4f353
commit 91c0283
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,18 +19,18 @@ jobs:
         # https://www.glfw.org/docs/latest/compile_guide.html#compile_deps_x11
         run: |
           sudo apt-get update
-          sudo apt-get install libwayland-dev libxkbcommon-dev xorg-dev
+          sudo apt-get install libwayland-dev libxkbcommon-dev xorg-dev ninja-build
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Fix Tag Checkout
         run: git fetch --tags --force
       - name: Configure
         run: >-
-          cmake -S . -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+          cmake -S . -B ${{github.workspace}}/build -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
           -DSATISFACTORY3DMAP_BUILD_PIC=OFF
       - name: Build
-        run: cmake --build ${{github.workspace}}/build --parallel 2
+        run: cmake --build ${{github.workspace}}/build
       - name: Print file hash
         run: sha256sum ${{github.workspace}}/build/map/Satisfactory3DMap
       - uses: actions/upload-artifact@v4
@@ -40,7 +40,7 @@ jobs:
 
   windows:
     name: Windows-Build
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@v4
         with:
@@ -53,7 +53,7 @@ jobs:
           -DSATISFACTORY3DMAP_DISABLE_CONSOLE=ON
           -DSATISFACTORY3DMAP_BUILD_PIC=OFF
       - name: Build
-        run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel 2
+        run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel 4
       - name: Print file hash
         run: Get-FileHash ${{github.workspace}}/build/map/${{env.BUILD_TYPE}}/Satisfactory3DMap.exe
       - uses: actions/upload-artifact@v4

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -43,7 +43,7 @@ jobs:
           name: python-sdist
           path: dist
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.17.0
+        uses: pypa/cibuildwheel@v2.21.3
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:

diff --git a/pyproject.toml b/pyproject.toml
@@ -22,6 +22,7 @@ classifiers = [
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: 3.13',
     'Topic :: File Formats',
     'Topic :: Games/Entertainment',
     'Topic :: Software Development',