From 9f78b57841635ae5105b6d7083b74f4411cf614e Mon Sep 17 00:00:00 2001 From: Gandalf Date: Tue, 6 Jan 2026 12:00:44 +0100 Subject: [PATCH] Fix main:* CI jobs appearing on develop branch pipelines Replace $CI_DEFAULT_BRANCH with hardcoded "main" in all main:* job rules. After the default branch was changed from main to develop, these jobs incorrectly matched on develop pipelines because $CI_DEFAULT_BRANCH now evaluates to "develop". Jobs fixed: - main:deploy-blog-mainnet - main:deploy-wallet-mainnet - main:deploy-blog-mirrornet - main:deploy-wallet-mirrornet - main:stop-blog-mainnet - main:stop-wallet-mainnet - main:stop-blog-mirrornet - main:stop-wallet-mirrornet --- .gitlab-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d77d236a7..57a8a99a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -733,7 +733,7 @@ main:deploy-blog-mainnet: APP_SESSION_TIME: 64800 DEPLOYMENT_ENV_FILE: "MAINNET_PROD_DEPLOYMENT_ENV" rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == "main" when: manual environment: name: main-blog-mainnet @@ -751,7 +751,7 @@ main:deploy-wallet-mainnet: IMAGE_NAME: $WALLET_IMAGE_NAME DEPLOYMENT_ENV_FILE: "MAINNET_PROD_DEPLOYMENT_ENV" rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == "main" when: manual environment: name: main-wallet-mainnet @@ -774,7 +774,7 @@ main:deploy-blog-mirrornet: DEPLOYMENT_ENV_FILE: "MIRRORNET_PROD_DEPLOYMENT_ENV" rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == "main" when: manual environment: name: main-blog-mirrornet @@ -796,7 +796,7 @@ main:deploy-wallet-mirrornet: DEPLOYMENT_ENV_FILE: "MIRRORNET_PROD_DEPLOYMENT_ENV" rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == "main" when: manual environment: name: main-wallet-mirrornet @@ -825,7 +825,7 @@ main:stop-blog-mainnet: variables: CONTAINER_NAME: denser-main-blog rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == "main" when: manual allow_failure: true environment: @@ -840,7 +840,7 @@ main:stop-wallet-mainnet: variables: CONTAINER_NAME: denser-main-wallet rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == "main" when: manual allow_failure: true environment: @@ -855,7 +855,7 @@ main:stop-blog-mirrornet: variables: CONTAINER_NAME: denser-main-blog-mirror rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == "main" when: manual allow_failure: true environment: @@ -870,7 +870,7 @@ main:stop-wallet-mirrornet: variables: CONTAINER_NAME: denser-main-wallet-mirror rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == "main" when: manual allow_failure: true environment: -- GitLab