ci: Reorder the clauses for more convenience
This commit is contained in:
parent
14859cb0fe
commit
2ad9cd36e2
|
@ -54,11 +54,11 @@ build_template_app:
|
||||||
- test $(xtensa-esp32-elf-nm *.a | grep -w ets_printf | wc -l) -eq 0
|
- test $(xtensa-esp32-elf-nm *.a | grep -w ets_printf | wc -l) -eq 0
|
||||||
|
|
||||||
|
|
||||||
.build_gitlab: &build_template
|
.build_template: &build_template
|
||||||
stage: build
|
stage: build
|
||||||
|
image: $CI_DOCKER_REGISTRY/esp32-ci-env
|
||||||
tags:
|
tags:
|
||||||
- build
|
- build
|
||||||
image: $CI_DOCKER_REGISTRY/esp32-ci-env
|
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
SDK_PATH: "$CI_PROJECT_DIR"
|
SDK_PATH: "$CI_PROJECT_DIR"
|
||||||
|
@ -176,13 +176,13 @@ test_build_system:
|
||||||
test_report:
|
test_report:
|
||||||
stage: test_report
|
stage: test_report
|
||||||
image: $CI_DOCKER_REGISTRY/esp32-ci-env
|
image: $CI_DOCKER_REGISTRY/esp32-ci-env
|
||||||
|
tags:
|
||||||
|
- report
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
- triggers
|
- triggers
|
||||||
- /^release\/v/
|
- /^release\/v/
|
||||||
- /^v\d+\.\d+(\.\d+)?($|-)/
|
- /^v\d+\.\d+(\.\d+)?($|-)/
|
||||||
tags:
|
|
||||||
- report
|
|
||||||
variables:
|
variables:
|
||||||
LOG_PATH: "$CI_PROJECT_DIR/$CI_BUILD_REF"
|
LOG_PATH: "$CI_PROJECT_DIR/$CI_BUILD_REF"
|
||||||
TEST_CASE_FILE_PATH: "$CI_PROJECT_DIR/components/idf_test"
|
TEST_CASE_FILE_PATH: "$CI_PROJECT_DIR/components/idf_test"
|
||||||
|
@ -228,14 +228,14 @@ push_master_to_github:
|
||||||
before_script:
|
before_script:
|
||||||
- echo "Not setting up GitLab key, not fetching submodules"
|
- echo "Not setting up GitLab key, not fetching submodules"
|
||||||
stage: deploy
|
stage: deploy
|
||||||
|
image: $CI_DOCKER_REGISTRY/esp32-ci-env
|
||||||
|
tags:
|
||||||
|
- deploy
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
- /^release\/v/
|
- /^release\/v/
|
||||||
- /^v\d+\.\d+(\.\d+)?($|-)/
|
- /^v\d+\.\d+(\.\d+)?($|-)/
|
||||||
tags:
|
|
||||||
- deploy
|
|
||||||
when: on_success
|
when: on_success
|
||||||
image: $CI_DOCKER_REGISTRY/esp32-ci-env
|
|
||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: clone
|
GIT_STRATEGY: clone
|
||||||
GITHUB_PUSH_REFS: refs/remotes/origin/release refs/remotes/origin/master
|
GITHUB_PUSH_REFS: refs/remotes/origin/release refs/remotes/origin/master
|
||||||
|
@ -261,14 +261,14 @@ deploy_docs:
|
||||||
before_script:
|
before_script:
|
||||||
- echo "Not setting up GitLab key, not fetching submodules"
|
- echo "Not setting up GitLab key, not fetching submodules"
|
||||||
stage: deploy
|
stage: deploy
|
||||||
|
image: $CI_DOCKER_REGISTRY/esp32-ci-env
|
||||||
|
tags:
|
||||||
|
- deploy
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
- /^release\/v/
|
- /^release\/v/
|
||||||
- /^v\d+\.\d+(\.\d+)?($|-)/
|
- /^v\d+\.\d+(\.\d+)?($|-)/
|
||||||
- triggers
|
- triggers
|
||||||
tags:
|
|
||||||
- deploy
|
|
||||||
image: $CI_DOCKER_REGISTRY/esp32-ci-env
|
|
||||||
script:
|
script:
|
||||||
- mkdir -p ~/.ssh
|
- mkdir -p ~/.ssh
|
||||||
- chmod 700 ~/.ssh
|
- chmod 700 ~/.ssh
|
||||||
|
|
Loading…
Reference in a new issue