replace master with main in ci

This commit is contained in:
Kai Kriegel 2022-02-14 18:58:50 +00:00
parent cd42130c2f
commit 62ac767839

View File

@ -30,7 +30,7 @@ lint:clippy:
- rustc --version && cargo --version # Print version info for debugging - rustc --version && cargo --version # Print version info for debugging
- cargo clippy -- -D warnings - cargo clippy -- -D warnings
only: only:
- master - main
- development - development
- merge_requests - merge_requests
tags: tags:
@ -44,7 +44,7 @@ lint:fmt:
- rustc --version && cargo --version # Print version info for debugging - rustc --version && cargo --version # Print version info for debugging
- cargo fmt -- --check # TODO: Do we want to enforce formating? - cargo fmt -- --check # TODO: Do we want to enforce formating?
only: only:
- master - main
- development - development
- merge_requests - merge_requests
tags: tags:
@ -57,14 +57,14 @@ test:cargo:
- rustc --version && cargo --version # Print version info for debugging - rustc --version && cargo --version # Print version info for debugging
- cargo test --workspace --verbose - cargo test --workspace --verbose
only: only:
- master - main
- development - development
- merge_requests - merge_requests
tags: tags:
- linux - linux
- docker - docker
build:docker-master: build:docker-main:
image: image:
name: gcr.io/kaniko-project/executor:v1.6.0-debug name: gcr.io/kaniko-project/executor:v1.6.0-debug
entrypoint: [""] entrypoint: [""]
@ -75,7 +75,7 @@ build:docker-master:
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- /kaniko/executor --force --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:latest - /kaniko/executor --force --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:latest
only: only:
- master - main
tags: tags:
- linux - linux
- docker - docker