From e7fb45acf49965fa5f09f5f949e268e9e6b2de2d Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 18 Aug 2025 01:50:28 -0500 Subject: [PATCH] Hopefully run merge now --- .gitlab-ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8c83bf..dc356e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,12 +10,9 @@ include: # done some of the time - local: .gitlab/build.yml rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" - when: always + - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" - if: $CI_PIPELINE_SOURCE == "tag" - when: always - if: $CI_COMMIT_BRANCH == "main" - when: always variables: PACKER_CONFIG_DIR: ./packer_config/