show rust version (#269)

* new image, show rust version

* show rust version, fix metadata
This commit is contained in:
TriplEight
2019-05-25 13:34:38 +02:00
committed by Gavin Wood
parent 32f9519743
commit f5640ed5a8
2 changed files with 18 additions and 22 deletions
+10 -14
View File
@@ -19,13 +19,11 @@ variables:
GIT_STRATEGY: fetch GIT_STRATEGY: fetch
CARGO_HOME: "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}" CARGO_HOME: "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}"
SCCACHE_DIR: "/ci-cache/${CI_PROJECT_NAME}/sccache" SCCACHE_DIR: "/ci-cache/${CI_PROJECT_NAME}/sccache"
SCCACHE_CACHE_SIZE: 50G
CI_SERVER_NAME: "GitLab CI" CI_SERVER_NAME: "GitLab CI"
DOCKER_OS: "debian:stretch" DOCKER_OS: "debian:stretch"
ARCH: "x86_64" ARCH: "x86_64"
.collect-artifacts: &collect-artifacts .collect-artifacts: &collect-artifacts
artifacts: artifacts:
name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}" name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
@@ -34,14 +32,17 @@ variables:
paths: paths:
- artifacts/ - artifacts/
.kubernetes-build: &kubernetes-build .kubernetes-build: &kubernetes-build
tags: tags:
- kubernetes-parity-build - kubernetes-parity-build
environment: environment:
name: parity-build name: parity-build
.compiler_info: &compiler_info
before_script:
- rustup show
- cargo --version
- sccache -s
#### stage: merge-test #### stage: merge-test
@@ -64,6 +65,7 @@ check-merge-conflict:
test-linux-stable: &test test-linux-stable: &test
stage: test stage: test
<<: *compiler_info
variables: variables:
RUST_TOOLCHAIN: stable RUST_TOOLCHAIN: stable
# Enable debug assertions since we are running optimized builds for testing # Enable debug assertions since we are running optimized builds for testing
@@ -81,17 +83,12 @@ test-linux-stable: &test
except: except:
variables: variables:
- $DEPLOY_TAG - $DEPLOY_TAG
before_script:
- sccache -s
- ./scripts/build.sh
script: script:
- ./scripts/build.sh
- time cargo test --all --release --verbose --locked - time cargo test --all --release --verbose --locked
- sccache -s - sccache -s
.build-only: &build-only .build-only: &build-only
only: only:
- master - master
@@ -103,15 +100,14 @@ build-linux-release: &build
stage: build stage: build
<<: *collect-artifacts <<: *collect-artifacts
<<: *build-only <<: *build-only
<<: *compiler_info
except: except:
variables: variables:
- $DEPLOY_TAG - $DEPLOY_TAG
tags: tags:
- linux-docker - linux-docker
before_script:
- sccache -s
- ./scripts/build.sh
script: script:
- ./scripts/build.sh
- time cargo build --release --verbose - time cargo build --release --verbose
- mkdir -p ./artifacts - mkdir -p ./artifacts
- mv ./target/release/polkadot ./artifacts/. - mv ./target/release/polkadot ./artifacts/.
@@ -165,7 +161,7 @@ publish-docker-release:
- test -z "${VERSION}" && exit 1 - test -z "${VERSION}" && exit 1
- cd ./artifacts - cd ./artifacts
- docker build - docker build
--build-arg VCS_REF="${CI_COMMIT_SHORT_SHA}" --build-arg VCS_REF="${CI_COMMIT_SHA}"
--build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')" --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
--tag $CONTAINER_IMAGE:$VERSION --tag $CONTAINER_IMAGE:$VERSION
--tag $CONTAINER_IMAGE:$EXTRATAG . --tag $CONTAINER_IMAGE:$EXTRATAG .
+1 -1
View File
@@ -8,7 +8,7 @@ LABEL io.parity.image.authors="devops-team@parity.io" \
io.parity.image.vendor="Parity Technologies" \ io.parity.image.vendor="Parity Technologies" \
io.parity.image.title="parity/polkadot" \ io.parity.image.title="parity/polkadot" \
io.parity.image.description="polkadot: a platform for web3" \ io.parity.image.description="polkadot: a platform for web3" \
io.parity.image.source="https://github.com/paritytech/polkadot/blob/master/scripts/docker/Dockerfile" \ io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/docker/Dockerfile" \
io.parity.image.revision="${VCS_REF}" \ io.parity.image.revision="${VCS_REF}" \
io.parity.image.created="${BUILD_DATE}" \ io.parity.image.created="${BUILD_DATE}" \
io.parity.image.documentation="https://github.com/paritytech/polkadot/" io.parity.image.documentation="https://github.com/paritytech/polkadot/"