okay make builds work better for merges

This commit is contained in:
Nadja Reitzenstein 2022-05-05 21:06:13 +02:00
parent cb63d3fef8
commit a5f5209371

View File

@ -52,33 +52,37 @@ lint:clippy:
# Use rustfmt to check formating # Use rustfmt to check formating
lint:fmt: lint:fmt:
extends: .lints extends: .lints
allow_failure: false
script: script:
- cargo +stable fmt --version - cargo +stable fmt --version
- echo -e "\e[0Ksection_start:`date +%s`:rustfmt_output\r\e[0KChanges suggested by rustfmt" - echo -e "\e[0Ksection_start:`date +%s`:rustfmt_output\r\e[0KChanges suggested by rustfmt"
- cargo +stable fmt --check -- -v - cargo +stable fmt --check -- -v
- echo -e "\e[0Ksection_end:`date +%s`:rustfmt_output\r\e[0K" - echo -e "\e[0Ksection_end:`date +%s`:rustfmt_output\r\e[0K"
# Check if the code builds on rust stable # Check if the code builds on rust stable
stable:build: stable:build:
stage: build stage: build
needs: ["lint:clippy", "lint:fmt"]
only:
- main
- development
- merge_requests
script: script:
- rustc +stable --version && cargo +stable --version - rustc +stable --version && cargo +stable --version
- echo -e "\e[0Ksection_start:`date +%s`:build_output\r\e[0KOutput of `cargo check`" - echo -e "\e[0Ksection_start:`date +%s`:build_output\r\e[0KOutput of `cargo check`"
- cargo +stable check --verbose - cargo +stable check --verbose
- echo -e "\e[0Ksection_end:`date +%s`:build_output\r\e[0K" - echo -e "\e[0Ksection_end:`date +%s`:build_output\r\e[0K"
stable:test:
stage: build
needs: ["stable:build"]
only:
- main
- development
- merge_requests
script:
- echo -e "\e[0Ksection_start:`date +%s`:build_output\r\e[0KOutput of `cargo test --no-run`" - echo -e "\e[0Ksection_start:`date +%s`:build_output\r\e[0KOutput of `cargo test --no-run`"
- cargo +stable test --verbose --no-run --workspace - cargo +stable test --verbose --no-run --workspace
- echo -e "\e[0Ksection_end:`date +%s`:build_output\r\e[0K" - echo -e "\e[0Ksection_end:`date +%s`:build_output\r\e[0K"
.tests: .tests:
stage: test stage: test
needs: ["stable:build"] needs: ["stable:test"]
script: script:
- > - >
cargo +stable test --workspace $TEST_TARGET -- cargo +stable test --workspace $TEST_TARGET --
@ -143,7 +147,6 @@ release_job:
build:docker-releases: build:docker-releases:
stage: dockerify stage: dockerify
needs: ["stable:build"]
image: image:
name: gcr.io/kaniko-project/executor:v1.6.0-debug name: gcr.io/kaniko-project/executor:v1.6.0-debug
entrypoint: [""] entrypoint: [""]
@ -159,7 +162,6 @@ build:docker-releases:
build:docker-development: build:docker-development:
stage: dockerify stage: dockerify
needs: ["stable:build"]
image: image:
name: gcr.io/kaniko-project/executor:v1.6.0-debug name: gcr.io/kaniko-project/executor:v1.6.0-debug
entrypoint: [""] entrypoint: [""]