Skip to content

Commit b82b8c7

Browse files
mathbunnyrumathbunnyru
authored
Merge branch 'develop' into no_conan_options
2 parents c414bfe + 1adbed7 commit b82b8c7

File tree

14 files changed

+23
-23
lines changed

14 files changed

+23
-23
lines changed

‎.github/scripts/conan/generate_matrix.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import json
44

55
LINUX_OS = ["heavy", "heavy-arm64"]
6-
LINUX_CONTAINERS = ['{ "image": "ghcr.io/xrplf/clio-ci:0e8896ad064a5290c4805318b549df16403ca2d7" }']
6+
LINUX_CONTAINERS = ['{ "image": "ghcr.io/xrplf/clio-ci:384e79cd32f5f6c0ab9be3a1122ead41c5a7e67d" }']
77
LINUX_COMPILERS = ["gcc", "clang"]
88

99
MACOS_OS = ["macos15"]

‎.github/scripts/conan/init.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SANITIZER_TEMPLATE_FILE="$REPO_DIR/docker/ci/conan/sanitizer_template.profile"
2222

2323
rm -rf "$CONAN_DIR"
2424

25-
conan remote add --index 0 ripple https://conan.ripplex.io
25+
conan remote add --index 0 xrplf https://conan.ripplex.io
2626

2727
cp "$REPO_DIR/docker/ci/conan/global.conf" "$CONAN_DIR/global.conf"
2828

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
build_type: [Release, Debug]
4646
container:
4747
[
48-
'{ "image": "ghcr.io/xrplf/clio-ci:0e8896ad064a5290c4805318b549df16403ca2d7" }',
48+
'{ "image": "ghcr.io/xrplf/clio-ci:384e79cd32f5f6c0ab9be3a1122ead41c5a7e67d" }',
4949
]
5050
static: [true]
5151

@@ -73,7 +73,7 @@ jobs:
7373
uses: ./.github/workflows/build_impl.yml
7474
with:
7575
runs_on: heavy
76-
container: '{ "image": "ghcr.io/xrplf/clio-ci:0e8896ad064a5290c4805318b549df16403ca2d7" }'
76+
container: '{ "image": "ghcr.io/xrplf/clio-ci:384e79cd32f5f6c0ab9be3a1122ead41c5a7e67d" }'
7777
conan_profile: gcc
7878
build_type: Debug
7979
disable_cache: false
@@ -91,7 +91,7 @@ jobs:
9191
uses: ./.github/workflows/build_impl.yml
9292
with:
9393
runs_on: heavy
94-
container: '{ "image": "ghcr.io/xrplf/clio-ci:0e8896ad064a5290c4805318b549df16403ca2d7" }'
94+
container: '{ "image": "ghcr.io/xrplf/clio-ci:384e79cd32f5f6c0ab9be3a1122ead41c5a7e67d" }'
9595
conan_profile: gcc
9696
build_type: Release
9797
disable_cache: false
@@ -107,7 +107,7 @@ jobs:
107107
needs: build-and-test
108108
runs-on: heavy
109109
container:
110-
image: ghcr.io/xrplf/clio-ci:0e8896ad064a5290c4805318b549df16403ca2d7
110+
image: ghcr.io/xrplf/clio-ci:384e79cd32f5f6c0ab9be3a1122ead41c5a7e67d
111111

112112
steps:
113113
- uses: actions/checkout@v4

‎.github/workflows/check_libxrpl.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
name: Build Clio / `libXRPL ${{ github.event.client_payload.version }}`
1818
runs-on: heavy
1919
container:
20-
image: ghcr.io/xrplf/clio-ci:0e8896ad064a5290c4805318b549df16403ca2d7
20+
image: ghcr.io/xrplf/clio-ci:384e79cd32f5f6c0ab9be3a1122ead41c5a7e67d
2121

2222
steps:
2323
- uses: actions/checkout@v4
@@ -67,7 +67,7 @@ jobs:
6767
needs: build
6868
runs-on: heavy
6969
container:
70-
image: ghcr.io/xrplf/clio-ci:0e8896ad064a5290c4805318b549df16403ca2d7
70+
image: ghcr.io/xrplf/clio-ci:384e79cd32f5f6c0ab9be3a1122ead41c5a7e67d
7171

7272
steps:
7373
- uses: actions/download-artifact@v5

‎.github/workflows/clang-tidy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
clang_tidy:
2525
runs-on: heavy
2626
container:
27-
image: ghcr.io/xrplf/clio-ci:0e8896ad064a5290c4805318b549df16403ca2d7
27+
image: ghcr.io/xrplf/clio-ci:384e79cd32f5f6c0ab9be3a1122ead41c5a7e67d
2828

2929
permissions:
3030
contents: write

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
build:
1515
runs-on: ubuntu-latest
1616
container:
17-
image: ghcr.io/xrplf/clio-ci:0e8896ad064a5290c4805318b549df16403ca2d7
17+
image: ghcr.io/xrplf/clio-ci:384e79cd32f5f6c0ab9be3a1122ead41c5a7e67d
1818

1919
steps:
2020
- name: Checkout

‎.github/workflows/nightly.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@ jobs:
3939
conan_profile: gcc
4040
build_type: Release
4141
static: true
42-
container: '{ "image": "ghcr.io/xrplf/clio-ci:0e8896ad064a5290c4805318b549df16403ca2d7" }'
42+
container: '{ "image": "ghcr.io/xrplf/clio-ci:384e79cd32f5f6c0ab9be3a1122ead41c5a7e67d" }'
4343
- os: heavy
4444
conan_profile: gcc
4545
build_type: Debug
4646
static: true
47-
container: '{ "image": "ghcr.io/xrplf/clio-ci:0e8896ad064a5290c4805318b549df16403ca2d7" }'
47+
container: '{ "image": "ghcr.io/xrplf/clio-ci:384e79cd32f5f6c0ab9be3a1122ead41c5a7e67d" }'
4848
- os: heavy
4949
conan_profile: gcc.ubsan
5050
build_type: Release
5151
static: false
52-
container: '{ "image": "ghcr.io/xrplf/clio-ci:0e8896ad064a5290c4805318b549df16403ca2d7" }'
52+
container: '{ "image": "ghcr.io/xrplf/clio-ci:384e79cd32f5f6c0ab9be3a1122ead41c5a7e67d" }'
5353

5454
uses: ./.github/workflows/build_and_test.yml
5555
with:
@@ -72,7 +72,7 @@ jobs:
7272
include:
7373
- os: heavy
7474
conan_profile: clang
75-
container: '{ "image": "ghcr.io/xrplf/clio-ci:0e8896ad064a5290c4805318b549df16403ca2d7" }'
75+
container: '{ "image": "ghcr.io/xrplf/clio-ci:384e79cd32f5f6c0ab9be3a1122ead41c5a7e67d" }'
7676
static: true
7777
- os: macos15
7878
conan_profile: apple-clang

‎.github/workflows/pre-commit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
uses: XRPLF/actions/.github/workflows/pre-commit.yml@afbcbdafbe0ce5439492fb87eda6441371086386
1212
with:
1313
runs_on: heavy
14-
container: '{ "image": "ghcr.io/xrplf/clio-ci:0e8896ad064a5290c4805318b549df16403ca2d7" }'
14+
container: '{ "image": "ghcr.io/xrplf/clio-ci:384e79cd32f5f6c0ab9be3a1122ead41c5a7e67d" }'

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
conan_profile: gcc
3030
build_type: Release
3131
static: true
32-
container: '{ "image": "ghcr.io/xrplf/clio-ci:0e8896ad064a5290c4805318b549df16403ca2d7" }'
32+
container: '{ "image": "ghcr.io/xrplf/clio-ci:384e79cd32f5f6c0ab9be3a1122ead41c5a7e67d" }'
3333

3434
uses: ./.github/workflows/build_and_test.yml
3535
with:

‎.github/workflows/release_impl.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
release:
4343
runs-on: heavy
4444
container:
45-
image: ghcr.io/xrplf/clio-ci:0e8896ad064a5290c4805318b549df16403ca2d7
45+
image: ghcr.io/xrplf/clio-ci:384e79cd32f5f6c0ab9be3a1122ead41c5a7e67d
4646
env:
4747
GH_REPO: ${{ github.repository }}
4848
GH_TOKEN: ${{ github.token }}

0 commit comments

Comments
 (0)