From 312e7be2b48b0e71c9219ba0e4b05ecb8998664f Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Wed, 13 Aug 2025 11:43:53 +0100 Subject: [PATCH] ci: Use GCC 15.2 (#2428) --- .github/scripts/conan/generate_matrix.py | 2 +- .github/workflows/build.yml | 6 +++--- .github/workflows/check_libxrpl.yml | 4 ++-- .github/workflows/clang-tidy.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/nightly.yml | 8 ++++---- .github/workflows/pre-commit.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/release_impl.yml | 2 +- .github/workflows/sanitizers.yml | 2 +- docker/develop/compose.yaml | 2 +- docs/build-clio.md | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/scripts/conan/generate_matrix.py b/.github/scripts/conan/generate_matrix.py index e285c6d3..c49fa5fe 100755 --- a/.github/scripts/conan/generate_matrix.py +++ b/.github/scripts/conan/generate_matrix.py @@ -3,7 +3,7 @@ import itertools import json LINUX_OS = ["heavy", "heavy-arm64"] -LINUX_CONTAINERS = ['{ "image": "ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5" }'] +LINUX_CONTAINERS = ['{ "image": "ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7" }'] LINUX_COMPILERS = ["gcc", "clang"] MACOS_OS = ["macos15"] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b14b61a6..e863f736 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,7 +45,7 @@ jobs: build_type: [Release, Debug] container: [ - '{ "image": "ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5" }', + '{ "image": "ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7" }', ] static: [true] @@ -73,7 +73,7 @@ jobs: uses: ./.github/workflows/build_impl.yml with: runs_on: heavy - container: '{ "image": "ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5" }' + container: '{ "image": "ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7" }' conan_profile: gcc build_type: Debug disable_cache: false @@ -90,7 +90,7 @@ jobs: needs: build-and-test runs-on: heavy container: - image: ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5 + image: ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/check_libxrpl.yml b/.github/workflows/check_libxrpl.yml index c2b900f6..362736c1 100644 --- a/.github/workflows/check_libxrpl.yml +++ b/.github/workflows/check_libxrpl.yml @@ -17,7 +17,7 @@ jobs: name: Build Clio / `libXRPL ${{ github.event.client_payload.version }}` runs-on: heavy container: - image: ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5 + image: ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7 steps: - uses: actions/checkout@v4 @@ -62,7 +62,7 @@ jobs: needs: build runs-on: heavy container: - image: ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5 + image: ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7 steps: - uses: actions/download-artifact@v5 diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index fe05403d..bec4da50 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -24,7 +24,7 @@ jobs: clang_tidy: runs-on: heavy container: - image: ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5 + image: ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7 permissions: contents: write diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 2af70e9e..839121ad 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5 + image: ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7 steps: - name: Checkout diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0cf72963..98836803 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -39,17 +39,17 @@ jobs: conan_profile: gcc build_type: Release static: true - container: '{ "image": "ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5" }' + container: '{ "image": "ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7" }' - os: heavy conan_profile: gcc build_type: Debug static: true - container: '{ "image": "ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5" }' + container: '{ "image": "ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7" }' - os: heavy conan_profile: gcc.ubsan build_type: Release static: false - container: '{ "image": "ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5" }' + container: '{ "image": "ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7" }' uses: ./.github/workflows/build_and_test.yml with: @@ -72,7 +72,7 @@ jobs: include: - os: heavy conan_profile: clang - container: '{ "image": "ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5" }' + container: '{ "image": "ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7" }' static: true - os: macos15 conan_profile: apple-clang diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index bf82d7a8..73dca309 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -10,7 +10,7 @@ jobs: run-hooks: runs-on: heavy container: - image: ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5 + image: ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7 steps: - name: Checkout Repo ⚡️ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index db7326f8..6f54c21b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: conan_profile: gcc build_type: Release static: true - container: '{ "image": "ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5" }' + container: '{ "image": "ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7" }' uses: ./.github/workflows/build_and_test.yml with: diff --git a/.github/workflows/release_impl.yml b/.github/workflows/release_impl.yml index 6bf830af..fdaf0468 100644 --- a/.github/workflows/release_impl.yml +++ b/.github/workflows/release_impl.yml @@ -42,7 +42,7 @@ jobs: release: runs-on: heavy container: - image: ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5 + image: ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7 env: GH_REPO: ${{ github.repository }} GH_TOKEN: ${{ github.token }} diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml index 3f3ff5aa..28d6462d 100644 --- a/.github/workflows/sanitizers.yml +++ b/.github/workflows/sanitizers.yml @@ -44,7 +44,7 @@ jobs: uses: ./.github/workflows/build_and_test.yml with: runs_on: heavy - container: '{ "image": "ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5" }' + container: '{ "image": "ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7" }' disable_cache: true conan_profile: ${{ matrix.compiler }}${{ matrix.sanitizer_ext }} build_type: ${{ matrix.build_type }} diff --git a/docker/develop/compose.yaml b/docker/develop/compose.yaml index 0601e7be..4b990b09 100644 --- a/docker/develop/compose.yaml +++ b/docker/develop/compose.yaml @@ -1,6 +1,6 @@ services: clio_develop: - image: ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5 + image: ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7 volumes: - clio_develop_conan_data:/root/.conan2/p - clio_develop_ccache:/root/.ccache diff --git a/docs/build-clio.md b/docs/build-clio.md index c957ebc8..d85e4fe9 100644 --- a/docs/build-clio.md +++ b/docs/build-clio.md @@ -163,7 +163,7 @@ To generate the API docs: It is also possible to build Clio using [Docker](https://www.docker.com/) if you don't want to install all the dependencies on your machine. ```sh -docker run -it ghcr.io/xrplf/clio-ci:a446d85297b3006e6d2c4dc7640368f096afecf5 +docker run -it ghcr.io/xrplf/clio-ci:de9b79adf037bbdb7364b4a8bd8bbd955cb547a7 git clone https://github.com/XRPLF/clio mkdir build && cd build conan install .. --output-folder . --build missing --settings build_type=Release -o '&:tests=True'