Migrate to the ubuntu-24.04 GitHub Actions runner

The ubuntu-20.04 runner is due to be deprecated on 2025-02-01 and unsupported by 2025-04-01.
loot · Jan 13, 2025 · 0f70b12 · 0f70b12
1 parent e7f1efe
commit 0f70b12
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ env:
 
 jobs:
   linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     env:
       LIBLOOT_VERSION: 0.24.5
@@ -55,8 +55,8 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y --no-upgrade \
-            libicu \
-            libtbb
+            libicu74 \
+            libtbb12
         if: steps.libloot-cache.outputs.cache-hit == 'true'
 
       - name: Download and build libloot
@@ -117,7 +117,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -G "Visual Studio 16 2019" -A Win32 -DCPACK_PACKAGE_VERSION="${{ steps.get-version.outputs.version }}"
+          cmake .. -G "Visual Studio 16 2019" -A x64 -DCPACK_PACKAGE_VERSION="${{ steps.get-version.outputs.version }}"
           cmake --build . --config ${{ env.MSVC_CONFIG }}
 
       - name: Build archive
@@ -127,7 +127,7 @@ jobs:
           cd build
           cpack -C ${{ env.MSVC_CONFIG }}
           VERSION="${{ steps.get-version.outputs.version }}"
-          echo "filename=metadata-validator-${VERSION}-win32.7z" >> $GITHUB_OUTPUT
+          echo "filename=metadata-validator-${VERSION}-win64.7z" >> $GITHUB_OUTPUT
 
       - name: Upload archive
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ env:
 
 jobs:
   create_release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
       git_tag: ${{ steps.get-git-tag.outputs.name }}
@@ -32,7 +32,7 @@ jobs:
             The `metadata-validator.tar.xz` file contains a Linux binary.
 
   linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: create_release
 
     env:
@@ -76,8 +76,8 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y --no-upgrade \
-            libicu \
-            libtbb
+            libicu74 \
+            libtbb12
         if: steps.libloot-cache.outputs.cache-hit == 'true'
 
       - name: Download and build libloot
@@ -142,7 +142,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -G "Visual Studio 16 2019" -A Win32 -DCPACK_PACKAGE_VERSION="${{ steps.get-version.outputs.version }}"
+          cmake .. -G "Visual Studio 16 2019" -A x64 -DCPACK_PACKAGE_VERSION="${{ steps.get-version.outputs.version }}"
           cmake --build . --config ${{ env.MSVC_CONFIG }}
 
       - name: Build archive
@@ -152,7 +152,7 @@ jobs:
           cd build
           cpack -C ${{ env.MSVC_CONFIG }}
           VERSION="${{ steps.get-version.outputs.version }}"
-          echo "filename=metadata-validator-${VERSION}-win32.7z" >> $GITHUB_OUTPUT
+          echo "filename=metadata-validator-${VERSION}-win64.7z" >> $GITHUB_OUTPUT
 
       - name: Upload Archive
         uses: actions/upload-release-asset@v1