Skip to content

Commit 29f4cf6

Browse files
committed
Update Docker image SHAs
1 parent 4eef686 commit 29f4cf6

File tree

3 files changed

+23
-4
lines changed

3 files changed

+23
-4
lines changed

.github/workflows/reusable-build-test.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ on:
2929
required: true
3030

3131
jobs:
32+
# Define the SHA of the CI Docker images to use for Linux builds.
33+
docker-image:
34+
outputs:
35+
sha: 6f723eb
36+
3237
# Generate the strategy matrix to be used by the following job.
3338
generate-matrix:
3439
uses: ./.github/workflows/reusable-strategy-matrix.yml
@@ -39,6 +44,7 @@ jobs:
3944
# Build and test the binary for each configuration.
4045
build-test-config:
4146
needs:
47+
- docker-image
4248
- generate-matrix
4349
uses: ./.github/workflows/reusable-build-test-config.yml
4450
strategy:
@@ -52,7 +58,7 @@ jobs:
5258
cmake_args: ${{ matrix.cmake_args }}
5359
cmake_target: ${{ matrix.cmake_target }}
5460
runs_on: ${{ toJSON(matrix.architecture.runner) }}
55-
image: ${{ contains(matrix.architecture.platform, 'linux') && format('ghcr.io/xrplf/ci/{0}-{1}:{2}-{3}-sha-5dd7158', matrix.os.distro_name, matrix.os.distro_version, matrix.os.compiler_name, matrix.os.compiler_version) || '' }}
61+
image: ${{ contains(matrix.architecture.platform, 'linux') && format('ghcr.io/xrplf/ci/{0}-{1}:{2}-{3}-sha-{4}', matrix.os.distro_name, matrix.os.distro_version, matrix.os.compiler_name, matrix.os.compiler_version, needs.docker-image.outputs.sha) || '' }}
5662
config_name: ${{ matrix.config_name }}
5763
secrets:
5864
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/reusable-notify-clio.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,16 @@ defaults:
3737
shell: bash
3838

3939
jobs:
40+
# Define the SHA of the CI Docker images to use for Linux builds.
41+
docker-image:
42+
outputs:
43+
sha: 6f723eb
44+
4045
upload:
46+
needs: docker-image
4147
if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
4248
runs-on: ubuntu-latest
43-
container: ghcr.io/xrplf/ci/ubuntu-noble:gcc-13-sha-5dd7158
49+
container: ghcr.io/xrplf/ci/ubuntu-noble:gcc-13-sha-${{ needs.docker-image.outputs.sha }}
4450
steps:
4551
- name: Checkout repository
4652
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0

.github/workflows/upload-conan-deps.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,28 @@ concurrency:
4040
cancel-in-progress: true
4141

4242
jobs:
43+
# Define the SHA of the CI Docker images to use for Linux builds.
44+
docker-image:
45+
outputs:
46+
sha: 6f723eb
47+
48+
# Generate the strategy matrix to be used by the following job.
4349
generate-matrix:
4450
uses: ./.github/workflows/reusable-strategy-matrix.yml
4551
with:
4652
strategy_matrix: ${{ github.event_name == 'pull_request' && 'minimal' || 'all' }}
4753

54+
# Build and upload the dependencies for each configuration.
4855
run-upload-conan-deps:
4956
needs:
57+
- docker-image
5058
- generate-matrix
5159
strategy:
5260
fail-fast: false
5361
matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
5462
max-parallel: 10
5563
runs-on: ${{ matrix.architecture.runner }}
56-
container: ${{ contains(matrix.architecture.platform, 'linux') && format('ghcr.io/xrplf/ci/{0}-{1}:{2}-{3}-sha-5dd7158', matrix.os.distro_name, matrix.os.distro_version, matrix.os.compiler_name, matrix.os.compiler_version) || null }}
57-
64+
container: ${{ contains(matrix.architecture.platform, 'linux') && format('ghcr.io/xrplf/ci/{0}-{1}:{2}-{3}-sha-{4}', matrix.os.distro_name, matrix.os.distro_version, matrix.os.compiler_name, matrix.os.compiler_version, needs.docker-image.outputs.sha) || null }}
5865
steps:
5966
- name: Cleanup workspace
6067
if: ${{ runner.os == 'macOS' }}

0 commit comments

Comments
 (0)