Skip to content

Commit a596bca

Browse files
TriplEightgavofyork
authored andcommitted
show rust version (paritytech#269)
* new image, show rust version * show rust version, fix metadata
1 parent be79c5d commit a596bca

File tree

2 files changed

+18
-22
lines changed

2 files changed

+18
-22
lines changed

.gitlab-ci.yml

+17-21
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,30 @@ variables:
1919
GIT_STRATEGY: fetch
2020
CARGO_HOME: "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}"
2121
SCCACHE_DIR: "/ci-cache/${CI_PROJECT_NAME}/sccache"
22-
SCCACHE_CACHE_SIZE: 50G
2322
CI_SERVER_NAME: "GitLab CI"
2423
DOCKER_OS: "debian:stretch"
2524
ARCH: "x86_64"
2625

2726

28-
2927
.collect-artifacts: &collect-artifacts
3028
artifacts:
3129
name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
3230
when: on_success
3331
expire_in: 7 days
3432
paths:
35-
- artifacts/
36-
37-
33+
- artifacts/
3834

3935
.kubernetes-build: &kubernetes-build
4036
tags:
4137
- kubernetes-parity-build
4238
environment:
4339
name: parity-build
4440

41+
.compiler_info: &compiler_info
42+
before_script:
43+
- rustup show
44+
- cargo --version
45+
- sccache -s
4546

4647

4748
#### stage: merge-test
@@ -64,6 +65,7 @@ check-merge-conflict:
6465

6566
test-linux-stable: &test
6667
stage: test
68+
<<: *compiler_info
6769
variables:
6870
RUST_TOOLCHAIN: stable
6971
# Enable debug assertions since we are running optimized builds for testing
@@ -81,37 +83,31 @@ test-linux-stable: &test
8183
except:
8284
variables:
8385
- $DEPLOY_TAG
84-
before_script:
85-
- sccache -s
86-
- ./scripts/build.sh
8786
script:
87+
- ./scripts/build.sh
8888
- time cargo test --all --release --verbose --locked
8989
- sccache -s
9090

9191

92-
93-
94-
95-
.build-only: &build-only
92+
.build-only: &build-only
9693
only:
9794
- master
9895
- tags
9996
- web
10097

10198

102-
build-linux-release: &build
99+
build-linux-release: &build
103100
stage: build
104101
<<: *collect-artifacts
105102
<<: *build-only
103+
<<: *compiler_info
106104
except:
107105
variables:
108106
- $DEPLOY_TAG
109107
tags:
110108
- linux-docker
111-
before_script:
112-
- sccache -s
113-
- ./scripts/build.sh
114109
script:
110+
- ./scripts/build.sh
115111
- time cargo build --release --verbose
116112
- mkdir -p ./artifacts
117113
- mv ./target/release/polkadot ./artifacts/.
@@ -165,7 +161,7 @@ publish-docker-release:
165161
- test -z "${VERSION}" && exit 1
166162
- cd ./artifacts
167163
- docker build
168-
--build-arg VCS_REF="${CI_COMMIT_SHORT_SHA}"
164+
--build-arg VCS_REF="${CI_COMMIT_SHA}"
169165
--build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
170166
--tag $CONTAINER_IMAGE:$VERSION
171167
--tag $CONTAINER_IMAGE:$EXTRATAG .
@@ -258,22 +254,22 @@ publish-s3-release:
258254
deploy-ew3:
259255
<<: *deploy-cibuild
260256
environment:
261-
name: parity-prod-ew3
257+
name: parity-prod-ew3
262258

263259
deploy-ue1:
264260
<<: *deploy-cibuild
265261
environment:
266-
name: parity-prod-ue1
262+
name: parity-prod-ue1
267263

268264
deploy-ew3-tag:
269265
<<: *deploy-tag
270266
environment:
271-
name: parity-prod-ew3
267+
name: parity-prod-ew3
272268

273269
deploy-ue1-tag:
274270
<<: *deploy-tag
275271
environment:
276-
name: parity-prod-ue1
272+
name: parity-prod-ue1
277273

278274

279275

scripts/docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LABEL io.parity.image.authors="devops-team@parity.io" \
88
io.parity.image.vendor="Parity Technologies" \
99
io.parity.image.title="parity/polkadot" \
1010
io.parity.image.description="polkadot: a platform for web3" \
11-
io.parity.image.source="https://github.com/paritytech/polkadot/blob/master/scripts/docker/Dockerfile" \
11+
io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/docker/Dockerfile" \
1212
io.parity.image.revision="${VCS_REF}" \
1313
io.parity.image.created="${BUILD_DATE}" \
1414
io.parity.image.documentation="https://github.com/paritytech/polkadot/"

0 commit comments

Comments
 (0)