Merge branch 'ci/move_esp_dockerfile_update_tools_job_to_pre_stage' into 'master'

ci: fix update_sha_in_esp-dockerfiles rules

See merge request espressif/esp-idf!23788
This commit is contained in:
Fu Hanxi
2023-06-06 08:17:47 +08:00
2 changed files with 6 additions and 2 deletions

View File

@@ -43,8 +43,7 @@ push_to_github:
deploy_update_SHA_in_esp-dockerfiles:
extends:
- .deploy_job_template
- .rules:ref:master-always
- .rules:tag:release
- .rules:protected-no_label-always
script:
- 'curl --header "PRIVATE-TOKEN: ${ESPCI_SCRIPTS_TOKEN}" -o create_MR_in_esp_dockerfile.sh $GITLAB_HTTP_SERVER/api/v4/projects/1260/repository/files/create_MR_in_esp_dockerfile%2Fcreate_MR_in_esp_dockerfile.sh/raw\?ref\=master'
- chmod +x create_MR_in_esp_dockerfile.sh

View File

@@ -373,6 +373,11 @@
rules:
- <<: *if-protected-no_label
.rules:protected-no_label-always:
rules:
- <<: *if-protected-no_label
when: always
.rules:dev:
rules:
- <<: *if-trigger