Skip to content

Commit

Permalink
- .github: g++13 removed from ubuntu-latest
Browse files Browse the repository at this point in the history
  • Loading branch information
oknenavin committed May 17, 2024
1 parent 18279b0 commit 846b168
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 26 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ jobs:
path: .dep/nlohmann
- name: Compiler setup
run: |
sudo apt-get update
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
sudo apt-get update -y
sudo apt-get install g++-13
- name: Boost setup
run: |
Expand Down Expand Up @@ -155,7 +156,7 @@ jobs:
- name: Compiler setup
run: |
sudo apt-get update
sudo apt-get install clang-14
sudo apt-get install clang-15
- name: Boost setup
run: |
cd .dep/boost
Expand Down
60 changes: 36 additions & 24 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ jobs:
run: |
echo 'deb [trusted=yes] http://dk.archive.ubuntu.com/ubuntu/ bionic main' | sudo tee -a /etc/apt/sources.list
echo 'deb [trusted=yes] http://dk.archive.ubuntu.com/ubuntu/ bionic universe' | sudo tee -a /etc/apt/sources.list
sudo apt update
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
sudo apt-get update -y
- name: Compiler setup
run: sudo apt install gcc-${{ matrix.compiler }} g++-${{ matrix.compiler }}
run: sudo apt-get install gcc-${{ matrix.compiler }} g++-${{ matrix.compiler }}
- name: Boost setup
run: sudo apt install libboost-container-dev
run: sudo apt-get install libboost-container-dev
- name: Check
env:
CXX: g++-${{ matrix.compiler }}
Expand All @@ -43,11 +44,13 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: APT Update
run: sudo apt update
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
sudo apt-get update -y
- name: Compiler setup
run: sudo apt install gcc-${{ matrix.compiler }} g++-${{ matrix.compiler }}
run: sudo apt-get install gcc-${{ matrix.compiler }} g++-${{ matrix.compiler }}
- name: Boost setup
run: sudo apt install libboost-container-dev
run: sudo apt-get install libboost-container-dev
- name: Check
env:
CXX: g++-${{ matrix.compiler }}
Expand All @@ -59,11 +62,13 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: APT Update
run: sudo apt update
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
sudo apt-get update -y
- name: Compiler setup
run: sudo apt install gcc-13-multilib g++-13-multilib
run: sudo apt-get install gcc-13-multilib g++-13-multilib
- name: Boost setup
run: sudo apt install libboost-container-dev
run: sudo apt-get install libboost-container-dev
- name: Check
env:
CXX: g++-13
Expand All @@ -76,11 +81,13 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: APT Update
run: sudo apt update
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
sudo apt-get update -y
- name: Compiler setup
run: sudo apt install gcc-13 g++-13
run: sudo apt-get install gcc-13 g++-13
- name: Boost setup
run: sudo apt install libboost-container-dev
run: sudo apt-get install libboost-container-dev
- name: Check
env:
CXX: g++-13
Expand All @@ -93,11 +100,13 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: APT Update
run: sudo apt update
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
sudo apt-get update -y
- name: Compiler setup
run: sudo apt install gcc-13 g++-13
run: sudo apt-get install gcc-13 g++-13
- name: Boost setup
run: sudo apt install libboost-container-dev
run: sudo apt-get install libboost-container-dev
- name: Check
env:
CXX: g++-13
Expand All @@ -110,11 +119,14 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: APT Update
run: sudo apt update
run: sudo apt-get update
- name: Compiler setup
run: sudo apt install gcc-13 g++-13
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
sudo apt-get update -y
sudo apt-get install gcc-13 g++-13
- name: Boost setup
run: sudo apt install libboost-container-dev
run: sudo apt-get install libboost-container-dev
- name: Check
env:
CXX: g++-13
Expand All @@ -139,11 +151,11 @@ jobs:
echo 'deb [trusted=yes] http://dk.archive.ubuntu.com/ubuntu/ bionic universe' | sudo tee -a /etc/apt/sources.list
echo 'deb [trusted=yes] http://dk.archive.ubuntu.com/ubuntu/ focal main' | sudo tee -a /etc/apt/sources.list
echo 'deb [trusted=yes] http://dk.archive.ubuntu.com/ubuntu/ focal universe' | sudo tee -a /etc/apt/sources.list
sudo apt update
sudo apt-get update
- name: Compiler setup
run: sudo apt install clang-${{ matrix.compiler }}
run: sudo apt-get install clang-${{ matrix.compiler }}
- name: Boost setup
run: sudo apt install libboost-container-dev
run: sudo apt-get install libboost-container-dev
- name: Check
env:
CXX: clang++-${{ matrix.compiler }}
Expand All @@ -159,11 +171,11 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: APT Update
run: sudo apt update
run: sudo apt-get update
- name: Compiler setup
run: sudo apt install clang-${{ matrix.compiler }}
run: sudo apt-get install clang-${{ matrix.compiler }}
- name: Boost setup
run: sudo apt install libboost-container-dev
run: sudo apt-get install libboost-container-dev
- name: Check
env:
CXX: clang++-${{ matrix.compiler }}
Expand Down

0 comments on commit 846b168

Please sign in to comment.