From dafc2ca98ec51f956128a1695266e4c08c7ab6ba Mon Sep 17 00:00:00 2001 From: Jorrit Rouwe Date: Fri, 17 Jan 2025 15:57:52 +0100 Subject: [PATCH] Update clang and gcc to versions supported on Ubuntu 24.04 --- .github/workflows/build.yml | 14 +++++++------- .github/workflows/determinism_check.yml | 22 +++++++++++----------- .github/workflows/sonar-cloud.yml | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 578db0897..0d475ea2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ env: jobs: linux-clang: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest name: Linux Clang strategy: fail-fast: false @@ -42,7 +42,7 @@ jobs: run: ctest --output-on-failure --verbose linux_clang_tsan: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest name: Linux Clang Sanitizers strategy: fail-fast: false @@ -68,7 +68,7 @@ jobs: run: ./PerformanceTest -q=LinearCast -t=max -s=Ragdoll linux-clang-so: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest name: Linux Clang Shared Library strategy: fail-fast: false @@ -88,7 +88,7 @@ jobs: run: ctest --output-on-failure --verbose linux-clang-32-bit: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest name: Linux Clang 32-bit strategy: fail-fast: false @@ -112,7 +112,7 @@ jobs: run: ctest --output-on-failure --verbose linux-clang-use-std-vector: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest name: Linux Clang using std::vector strategy: fail-fast: false @@ -133,7 +133,7 @@ jobs: run: ctest --output-on-failure --verbose linux-gcc: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest name: Linux GCC strategy: fail-fast: false @@ -155,7 +155,7 @@ jobs: run: ctest --output-on-failure --verbose linux-gcc-so: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest name: Linux GCC Shared Library strategy: fail-fast: false diff --git a/.github/workflows/determinism_check.yml b/.github/workflows/determinism_check.yml index 95b997e63..d3a5d802e 100644 --- a/.github/workflows/determinism_check.yml +++ b/.github/workflows/determinism_check.yml @@ -5,11 +5,11 @@ env: RAGDOLL_HASH: '0x275057ded572c916' PYRAMID_HASH: '0x198b8eeaee57e29a' EMSCRIPTEN_VERSION: 3.1.73 - UBUNTU_CLANG_VERSION: clang++-15 - UBUNTU_GCC_VERSION: g++-12 - UBUNTU_GCC_AARCH64_VERSION: aarch64-linux-gnu-g++-12 - UBUNTU_GCC_RISCV_VERSION: riscv64-linux-gnu-g++-12 - UBUNTU_GCC_POWERPC_VERSION: powerpc64le-linux-gnu-g++-12 + UBUNTU_CLANG_VERSION: clang++-18 + UBUNTU_GCC_VERSION: g++-14 + UBUNTU_GCC_AARCH64_VERSION: aarch64-linux-gnu-g++-14 + UBUNTU_GCC_RISCV_VERSION: riscv64-linux-gnu-g++-14 + UBUNTU_GCC_POWERPC_VERSION: powerpc64le-linux-gnu-g++-14 UBUNTU_GCC_LOONGARCH_VERSION: loongarch64-linux-gnu-g++-14 on: @@ -163,7 +163,7 @@ jobs: - name: Update index run: sudo apt-get update - name: Install Cross Compiler - run: sudo apt-get install gcc-12-aarch64-linux-gnu gcc-12-multilib g++-12-multilib libstdc++-12-dev-arm64-cross qemu-user -y + run: sudo apt-get install gcc-14-aarch64-linux-gnu gcc-14-multilib g++-14-multilib libstdc++-14-dev-arm64-cross qemu-user -y - name: Configure CMake working-directory: ${{github.workspace}}/Build run: ./cmake_linux_clang_gcc.sh Distribution ${{env.UBUNTU_CLANG_VERSION}} -DCROSS_COMPILE_ARM=ON -DCROSS_PLATFORM_DETERMINISTIC=ON -DTARGET_VIEWER=OFF -DTARGET_SAMPLES=OFF -DTARGET_HELLO_WORLD=OFF -DTARGET_UNIT_TESTS=ON -DTARGET_PERFORMANCE_TEST=ON @@ -191,7 +191,7 @@ jobs: - name: Update index run: sudo apt-get update - name: Install Cross Compiler - run: sudo apt-get install g++-12-arm-linux-gnueabihf qemu-user -y + run: sudo apt-get install g++-14-arm-linux-gnueabihf qemu-user -y - name: Configure CMake working-directory: ${{github.workspace}}/Build run: ./cmake_linux_clang_gcc.sh Distribution ${{env.UBUNTU_CLANG_VERSION}} -DCROSS_COMPILE_ARM=ON -DCROSS_COMPILE_ARM_TARGET="arm-linux-gnueabihf" -DCROSS_PLATFORM_DETERMINISTIC=ON -DTARGET_VIEWER=OFF -DTARGET_SAMPLES=OFF -DTARGET_HELLO_WORLD=OFF -DTARGET_UNIT_TESTS=ON -DTARGET_PERFORMANCE_TEST=ON @@ -219,7 +219,7 @@ jobs: - name: Update index run: sudo apt-get update - name: Install Cross Compiler - run: sudo apt-get install g++-12-aarch64-linux-gnu gcc-12-multilib g++-12-multilib libstdc++-12-dev-arm64-cross qemu-user -y + run: sudo apt-get install g++-14-aarch64-linux-gnu gcc-14-multilib g++-14-multilib libstdc++-14-dev-arm64-cross qemu-user -y - name: Configure CMake working-directory: ${{github.workspace}}/Build run: ./cmake_linux_clang_gcc.sh Distribution ${{env.UBUNTU_GCC_AARCH64_VERSION}} -DCROSS_COMPILE_ARM=ON -DCROSS_PLATFORM_DETERMINISTIC=ON -DTARGET_VIEWER=OFF -DTARGET_SAMPLES=OFF -DTARGET_HELLO_WORLD=OFF -DTARGET_UNIT_TESTS=ON -DTARGET_PERFORMANCE_TEST=ON @@ -247,7 +247,7 @@ jobs: - name: Update index run: sudo apt-get update - name: Install Cross Compiler - run: sudo apt-get install g++-12-riscv64-linux-gnu gcc-12-multilib g++-12-multilib qemu-user -y + run: sudo apt-get install g++-14-riscv64-linux-gnu gcc-14-multilib g++-14-multilib qemu-user -y - name: Configure CMake working-directory: ${{github.workspace}}/Build run: ./cmake_linux_clang_gcc.sh Distribution ${{env.UBUNTU_GCC_RISCV_VERSION}} -DCROSS_COMPILE_ARM=ON -DCROSS_PLATFORM_DETERMINISTIC=ON -DCROSS_COMPILE_ARM_TARGET="" -DTARGET_VIEWER=OFF -DTARGET_SAMPLES=OFF -DTARGET_HELLO_WORLD=OFF -DTARGET_UNIT_TESTS=ON -DTARGET_PERFORMANCE_TEST=ON @@ -275,7 +275,7 @@ jobs: - name: Update index run: sudo apt-get update - name: Install Cross Compiler - run: sudo apt-get install g++-12-powerpc64le-linux-gnu gcc-12-multilib g++-12-multilib qemu-user -y + run: sudo apt-get install g++-14-powerpc64le-linux-gnu gcc-14-multilib g++-14-multilib qemu-user -y - name: Configure CMake working-directory: ${{github.workspace}}/Build run: ./cmake_linux_clang_gcc.sh Distribution ${{env.UBUNTU_GCC_POWERPC_VERSION}} -DCROSS_COMPILE_ARM=ON -DCROSS_PLATFORM_DETERMINISTIC=ON -DCROSS_COMPILE_ARM_TARGET="" -DTARGET_VIEWER=OFF -DTARGET_SAMPLES=OFF -DTARGET_HELLO_WORLD=OFF -DTARGET_UNIT_TESTS=ON -DTARGET_PERFORMANCE_TEST=ON @@ -304,7 +304,7 @@ jobs: - name: Update index run: sudo apt-get update - name: Install Cross Compiler - run: sudo apt-get install g++-14-loongarch64-linux-gnu gcc-12-multilib g++-12-multilib qemu-user -y + run: sudo apt-get install g++-14-loongarch64-linux-gnu gcc-14-multilib g++-14-multilib qemu-user -y - name: Configure CMake working-directory: ${{github.workspace}}/Build run: ./cmake_linux_clang_gcc.sh Distribution ${{env.UBUNTU_GCC_LOONGARCH_VERSION}} -DCROSS_COMPILE_ARM=ON -DCROSS_PLATFORM_DETERMINISTIC=ON -DCROSS_COMPILE_ARM_TARGET="" -DTARGET_VIEWER=OFF -DTARGET_SAMPLES=OFF -DTARGET_HELLO_WORLD=OFF -DTARGET_UNIT_TESTS=ON -DTARGET_PERFORMANCE_TEST=ON diff --git a/.github/workflows/sonar-cloud.yml b/.github/workflows/sonar-cloud.yml index d1f9f18b7..e5512abbe 100644 --- a/.github/workflows/sonar-cloud.yml +++ b/.github/workflows/sonar-cloud.yml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest env: BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed - CLANG_VERSION: 15 + CLANG_VERSION: 18 steps: - uses: actions/checkout@v4 with: