From 846b1685f568f0c080919209f7ad653b20baa313 Mon Sep 17 00:00:00 2001 From: oknenavin Date: Fri, 17 May 2024 23:36:48 +0300 Subject: [PATCH] - .github: g++13 removed from ubuntu-latest --- .github/workflows/benchmarks.yml | 5 +-- .github/workflows/linux.yml | 60 +++++++++++++++++++------------- 2 files changed, 39 insertions(+), 26 deletions(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 33780505..e978790b 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -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: | @@ -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 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 2898d613..76fcd977 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -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 }} @@ -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 }} @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 }} @@ -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 }}