Hopefully run merge now
This commit is contained in:
+1
-4
@@ -10,12 +10,9 @@ include:
|
|||||||
# done some of the time
|
# done some of the time
|
||||||
- local: .gitlab/build.yml
|
- local: .gitlab/build.yml
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
- if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"
|
||||||
when: always
|
|
||||||
- if: $CI_PIPELINE_SOURCE == "tag"
|
- if: $CI_PIPELINE_SOURCE == "tag"
|
||||||
when: always
|
|
||||||
- if: $CI_COMMIT_BRANCH == "main"
|
- if: $CI_COMMIT_BRANCH == "main"
|
||||||
when: always
|
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
PACKER_CONFIG_DIR: ./packer_config/
|
PACKER_CONFIG_DIR: ./packer_config/
|
||||||
|
|||||||
Reference in New Issue
Block a user