Skip to content

Commit ccd77b6

Browse files
Update Github Actions to use Ubuntu 24 & 22
Ubuntu 20 is being removed from actions, so we need to update. pkg-config:i386 isn't installed by default, so we need to add it
1 parent ac94112 commit ccd77b6

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.github/workflows/build.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
matrix:
4242
compiler: [ {cc: gcc, cxx: g++}, {cc: clang, cxx: clang++} ]
4343
config: [ Debug, Release ]
44-
os: [ ubuntu-20.04, ubuntu-22.04 ]
44+
os: [ ubuntu-22.04, ubuntu-24.04 ]
4545
steps:
4646
- uses: actions/checkout@v4
4747
- uses: actions/setup-python@v5
@@ -53,7 +53,7 @@ jobs:
5353
# practice to try and support them so they don't have to install
5454
# the CMake tarball. Ideally the minimum we use matches what the default
5555
# package provided by Ubuntu via APT.
56-
if: ${{ matrix.os == 'ubuntu-20.04' }}
56+
if: ${{ matrix.os == 'ubuntu-22.04' }}
5757
uses: lukka/get-cmake@latest
5858
with:
5959
cmakeVersion: 3.22.1
@@ -84,7 +84,7 @@ jobs:
8484

8585
linux-no-asm:
8686
needs: codegen
87-
runs-on: ubuntu-22.04
87+
runs-on: ubuntu-24.04
8888
steps:
8989
- uses: actions/checkout@v4
9090
- run: sudo apt update
@@ -104,7 +104,7 @@ jobs:
104104

105105
linux-32:
106106
needs: codegen
107-
runs-on: ubuntu-22.04
107+
runs-on: ubuntu-24.04
108108
strategy:
109109
matrix:
110110
config: [ Debug, Release ]
@@ -122,7 +122,7 @@ jobs:
122122
- run: |
123123
sudo apt install --yes --no-install-recommends \
124124
gcc-multilib g++-multilib libc6:i386 libc6-dev-i386 libgcc-s1:i386 \
125-
libwayland-dev:i386 libxrandr-dev:i386
125+
libwayland-dev:i386 libxrandr-dev:i386 pkg-config:i386
126126
- run: |
127127
cmake -S. -B build \
128128
-D CMAKE_BUILD_TYPE=${{matrix.config}} \
@@ -144,7 +144,7 @@ jobs:
144144

145145
linux-32-no-asm:
146146
needs: codegen
147-
runs-on: ubuntu-22.04
147+
runs-on: ubuntu-24.04
148148
steps:
149149
- uses: actions/checkout@v4
150150
- uses: actions/setup-python@v5
@@ -159,7 +159,7 @@ jobs:
159159
- run: |
160160
sudo apt install --yes --no-install-recommends \
161161
gcc-multilib g++-multilib libc6:i386 libc6-dev-i386 libgcc-s1:i386 \
162-
libwayland-dev:i386 libxrandr-dev:i386
162+
libwayland-dev:i386 libxrandr-dev:i386 pkg-config:i386
163163
- run: |
164164
cmake -S. -B build \
165165
-D CMAKE_BUILD_TYPE=Release \

0 commit comments

Comments
 (0)