Compare commits

...

2 Commits

Author SHA1 Message Date
Jingchen
eb6d9c1cb6 Merge branch 'develop' into ci/use-new-macos-runners 2025-07-25 10:21:55 +01:00
JCW
7ed62f0ea3 Fix build error
Signed-off-by: JCW <a1q123456@users.noreply.github.com>

Use new ec2 macos runner

Signed-off-by: JCW <a1q123456@users.noreply.github.com>

Fix build error

Signed-off-by: JCW <a1q123456@users.noreply.github.com>

Revert unnecessary changes

Signed-off-by: JCW <a1q123456@users.noreply.github.com>

Update runners

Signed-off-by: JCW <a1q123456@users.noreply.github.com>

Revert unnecessary changes

Signed-off-by: JCW <a1q123456@users.noreply.github.com>

Switch to self hosted runner

Signed-off-by: JCW <a1q123456@users.noreply.github.com>
2025-07-24 14:13:29 +01:00
4 changed files with 9 additions and 9 deletions

View File

@@ -8,7 +8,7 @@ on:
jobs: jobs:
check: check:
if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }} 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 container: ghcr.io/xrplf/ci/tools-rippled-clang-format
steps: steps:
# For jobs running in containers, $GITHUB_WORKSPACE and ${{ github.workspace }} might not be the # For jobs running in containers, $GITHUB_WORKSPACE and ${{ github.workspace }} might not be the

View File

@@ -40,7 +40,7 @@ jobs:
- Ninja - Ninja
configuration: configuration:
- Release - Release
runs-on: [self-hosted, macOS, mac-runner-m1] runs-on: [self-hosted, macOS, devbox]
env: env:
# The `build` action requires these variables. # The `build` action requires these variables.
build_dir: .build build_dir: .build

View File

@@ -74,7 +74,7 @@ jobs:
compiler_version: 16 compiler_version: 16
distro: debian distro: debian
codename: bookworm 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 }} container: ghcr.io/xrplf/ci/${{ matrix.distro }}-${{ matrix.codename }}:${{ matrix.compiler }}-${{ matrix.compiler_version }}
env: env:
build_dir: .build build_dir: .build
@@ -133,7 +133,7 @@ jobs:
- -
- "-Dunity=ON" - "-Dunity=ON"
needs: dependencies 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 }} container: ghcr.io/xrplf/ci/${{ matrix.distro }}-${{ matrix.codename }}:${{ matrix.compiler }}-${{ matrix.compiler_version }}
env: env:
build_dir: .build build_dir: .build
@@ -194,7 +194,7 @@ jobs:
- "-DUNIT_TEST_REFERENCE_FEE=200" - "-DUNIT_TEST_REFERENCE_FEE=200"
- "-DUNIT_TEST_REFERENCE_FEE=1000" - "-DUNIT_TEST_REFERENCE_FEE=1000"
needs: dependencies needs: dependencies
runs-on: [self-hosted, heavy] runs-on: [self-hosted, Linux, X64, devbox]
container: ghcr.io/xrplf/ci/ubuntu-jammy:gcc-12 container: ghcr.io/xrplf/ci/ubuntu-jammy:gcc-12
env: env:
build_dir: .build build_dir: .build
@@ -242,7 +242,7 @@ jobs:
configuration: configuration:
- Debug - Debug
needs: dependencies needs: dependencies
runs-on: [self-hosted, heavy] runs-on: [self-hosted, Linux, X64, devbox]
container: ghcr.io/xrplf/ci/ubuntu-jammy:gcc-12 container: ghcr.io/xrplf/ci/ubuntu-jammy:gcc-12
env: env:
build_dir: .build build_dir: .build
@@ -309,7 +309,7 @@ jobs:
conan: conan:
needs: dependencies needs: dependencies
runs-on: [self-hosted, heavy] runs-on: [self-hosted, Linux, X64, devbox]
container: container:
image: ghcr.io/xrplf/ci/ubuntu-jammy:gcc-12 image: ghcr.io/xrplf/ci/ubuntu-jammy:gcc-12
env: env:
@@ -358,7 +358,7 @@ jobs:
instrumentation-build: instrumentation-build:
needs: dependencies needs: dependencies
runs-on: [self-hosted, heavy] runs-on: [self-hosted, Linux, X64, devbox]
container: ghcr.io/xrplf/ci/debian-bookworm:clang-16 container: ghcr.io/xrplf/ci/debian-bookworm:clang-16
env: env:
build_dir: .build build_dir: .build

View File

@@ -40,7 +40,7 @@ jobs:
matrix: matrix:
version: version:
- generator: Visual Studio 17 2022 - generator: Visual Studio 17 2022
runs-on: windows-2022 runs-on: [self-hosted, Windows, devbox]
configuration: configuration:
- type: Release - type: Release
tests: true tests: true