Skip to content

Commit

Permalink
[Actions] Update GCC multilib version and use venv for jsonref (#49)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
VeithMetro authored Oct 14, 2024
1 parent 7c84128 commit 34faad6
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/Linux build template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
ThunderLibraries:

runs-on: ubuntu-latest
runs-on: ubuntu-24.04

strategy:
matrix:
Expand All @@ -28,8 +28,10 @@ jobs:
echo "deb http://archive.ubuntu.com/ubuntu/ jammy-updates main universe restricted multiverse" | sudo tee -a /etc/apt/sources.list
sudo dpkg --add-architecture i386
sudo apt-get update
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
sudo pip install jsonref
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'}}
python3 -m venv venv
source venv/bin/activate
pip install jsonref
- name: Download artifacts
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -61,6 +63,7 @@ jobs:
# ----- Building & uploading -----
- name: Build ThunderLibraries
run: |
source venv/bin/activate
cmake -G Ninja -S ThunderLibraries -B ${{matrix.build_type}}/build/ThunderLibraries \
-DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
-DCMAKE_C_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
Expand Down

0 comments on commit 34faad6

Please sign in to comment.