From 7ed62f0ea353505ff2e2bc2cc20a905357a2c914 Mon Sep 17 00:00:00 2001 From: JCW Date: Tue, 22 Jul 2025 10:36:05 +0100 Subject: [PATCH] Fix build error Signed-off-by: JCW Use new ec2 macos runner Signed-off-by: JCW Fix build error Signed-off-by: JCW Revert unnecessary changes Signed-off-by: JCW Update runners Signed-off-by: JCW Revert unnecessary changes Signed-off-by: JCW Switch to self hosted runner Signed-off-by: JCW --- .github/workflows/clang-format.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/nix.yml | 13 ++++++------- .github/workflows/windows.yml | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index 0d81f87791..8f86599557 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -8,7 +8,7 @@ on: jobs: check: if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }} - runs-on: ubuntu-24.04 + runs-on: [self-hosted, Linux, X64, devbox] container: ghcr.io/xrplf/ci/tools-rippled-clang-format steps: # For jobs running in containers, $GITHUB_WORKSPACE and ${{ github.workspace }} might not be the diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 3c47a8bd53..a32def7ab2 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -40,7 +40,7 @@ jobs: - Ninja configuration: - Release - runs-on: [self-hosted, macOS, mac-runner-m1] + runs-on: [self-hosted, macOS, devbox] env: # The `build` action requires these variables. build_dir: .build diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 9ff96035b2..c8c760ef50 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -74,7 +74,7 @@ jobs: compiler_version: 16 distro: debian codename: bookworm - runs-on: [self-hosted, heavy] + runs-on: [self-hosted, Linux, X64, devbox] container: ghcr.io/xrplf/ci/${{ matrix.distro }}-${{ matrix.codename }}:${{ matrix.compiler }}-${{ matrix.compiler_version }} env: build_dir: .build @@ -134,7 +134,7 @@ jobs: - - "-Dunity=ON" needs: dependencies - runs-on: [self-hosted, heavy] + runs-on: [self-hosted, Linux, X64, devbox] container: ghcr.io/xrplf/ci/${{ matrix.distro }}-${{ matrix.codename }}:${{ matrix.compiler }}-${{ matrix.compiler_version }} env: build_dir: .build @@ -195,7 +195,7 @@ jobs: - "-DUNIT_TEST_REFERENCE_FEE=200" - "-DUNIT_TEST_REFERENCE_FEE=1000" needs: dependencies - runs-on: [self-hosted, heavy] + runs-on: [self-hosted, Linux, X64, devbox] container: ghcr.io/xrplf/ci/ubuntu-jammy:gcc-12 env: build_dir: .build @@ -243,7 +243,7 @@ jobs: configuration: - Debug needs: dependencies - runs-on: [self-hosted, heavy] + runs-on: [self-hosted, Linux, X64, devbox] container: ghcr.io/xrplf/ci/ubuntu-jammy:gcc-12 env: build_dir: .build @@ -310,7 +310,7 @@ jobs: conan: needs: dependencies - runs-on: [self-hosted, heavy] + runs-on: [self-hosted, Linux, X64, devbox] container: image: ghcr.io/xrplf/ci/ubuntu-jammy:gcc-12 env: @@ -365,9 +365,8 @@ jobs: if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }} env: CLANG_RELEASE: 16 - runs-on: [self-hosted, heavy] + runs-on: [self-hosted, Linux, X64, devbox] container: ghcr.io/xrplf/ci/debian-bookworm:clang-16 - steps: - name: checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 1479c47600..4de6fd31a5 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -40,7 +40,7 @@ jobs: matrix: version: - generator: Visual Studio 17 2022 - runs-on: windows-2022 + runs-on: [self-hosted, Windows, devbox] configuration: - type: Release tests: true