Skip to content

Commit 34faad6

Browse files
authored
[Actions] Update GCC multilib version and use venv for jsonref (#49)
* Update GCC multilib version and use venv for jsonref * Use the develop branch for testing for now * Explicitly state the ubuntu version * Use the master template as all changes were merged
1 parent 7c84128 commit 34faad6

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

.github/workflows/Linux build template.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77
ThunderLibraries:
88

9-
runs-on: ubuntu-latest
9+
runs-on: ubuntu-24.04
1010

1111
strategy:
1212
matrix:
@@ -28,8 +28,10 @@ jobs:
2828
echo "deb http://archive.ubuntu.com/ubuntu/ jammy-updates main universe restricted multiverse" | sudo tee -a /etc/apt/sources.list
2929
sudo dpkg --add-architecture i386
3030
sudo apt-get update
31-
sudo apt install python3-pip build-essential cmake ninja-build libusb-1.0-0-dev zlib1g-dev zlib1g-dev:i386 libssl-dev gcc-11-multilib g++-11-multilib
32-
sudo pip install jsonref
31+
sudo apt install python3-pip build-essential cmake ninja-build libusb-1.0-0-dev ${{matrix.architecture == '32' && 'zlib1g-dev:i386 libssl-dev:i386 gcc-13-multilib g++-13-multilib' || 'zlib1g-dev libssl-dev'}}
32+
python3 -m venv venv
33+
source venv/bin/activate
34+
pip install jsonref
3335
3436
- name: Download artifacts
3537
uses: actions/download-artifact@v4
@@ -61,6 +63,7 @@ jobs:
6163
# ----- Building & uploading -----
6264
- name: Build ThunderLibraries
6365
run: |
66+
source venv/bin/activate
6467
cmake -G Ninja -S ThunderLibraries -B ${{matrix.build_type}}/build/ThunderLibraries \
6568
-DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
6669
-DCMAKE_C_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \

0 commit comments

Comments
 (0)