Skip to content

Commit 8f6b632

Browse files
authored
[ci] Return CI_IMAGE variable (#2647)
close paritytech/ci_cd#900
1 parent 9f3c67b commit 8f6b632

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/fmt-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
os: ["ubuntu-latest"]
1616
runs-on: ${{ matrix.os }}
1717
container:
18-
image: paritytech/ci-unified:bullseye-1.73.0-2023-11-01-v20231025
18+
image: paritytech/ci-unified:bullseye-1.74.0-2023-11-01-v20231204
1919
steps:
2020
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2121

.gitlab-ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ workflow:
2121
- if: $CI_COMMIT_BRANCH
2222

2323
variables:
24-
CI_IMAGE: "docker.io/paritytech/ci-unified:bullseye-1.74.0-2023-11-01-v20231204"
24+
CI_IMAGE: !reference [.ci-unified, variables, CI_IMAGE]
2525
# BUILDAH_IMAGE is defined in group variables
2626
BUILDAH_COMMAND: "buildah --storage-driver overlay2"
2727
RELENG_SCRIPTS_BRANCH: "master"
@@ -116,27 +116,27 @@ default:
116116
tags:
117117
- linux-docker
118118

119-
#
119+
#
120120
.forklift-cache:
121121
before_script:
122122
- 'curl --header "PRIVATE-TOKEN: $FL_CI_GROUP_TOKEN" -o forklift -L "${CI_API_V4_URL}/projects/676/packages/generic/forklift/${FL_FORKLIFT_VERSION}/forklift_${FL_FORKLIFT_VERSION}_linux_amd64"'
123123
- chmod +x forklift
124124
- mkdir .forklift
125125
- cp $FL_FORKLIFT_CONFIG .forklift/config.toml
126126
- export FORKLIFT_PACKAGE_SUFFIX=${CI_JOB_NAME/ [0-9 \/]*}
127-
- shopt -s expand_aliases
127+
- shopt -s expand_aliases
128128
- export PATH=$PATH:$(pwd)
129129
- |
130130
if [ "$FORKLIFT_BYPASS" != "true" ]; then
131131
echo "FORKLIFT_BYPASS not set, creating alias cargo='forklift cargo'"
132132
alias cargo="forklift cargo"
133133
fi
134-
- ls -al
135-
- rm -f forklift.sock
134+
- ls -al
135+
- rm -f forklift.sock
136136
- forklift clean
137137
#
138138
- echo "FL_FORKLIFT_VERSION ${FL_FORKLIFT_VERSION}"
139-
- echo "FORKLIFT_PACKAGE_SUFFIX $FORKLIFT_PACKAGE_SUFFIX"
139+
- echo "FORKLIFT_PACKAGE_SUFFIX $FORKLIFT_PACKAGE_SUFFIX"
140140

141141
.common-refs:
142142
rules:

0 commit comments

Comments
 (0)