diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bafff791..2770c3c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,7 @@ create_build_machines: - /home/gitlab-runner/build-machine-ctl.sh create arm64-deb - /home/gitlab-runner/build-machine-ctl.sh create amd64-rpm rules: - - if: '$CI_COMMIT_REF_NAME == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/' + - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/' package_amd64_deb: stage: build_packages @@ -72,7 +72,7 @@ package_amd64_deb: - earthly +package-linux-amd64-deb - /home/gitlab-runner/scp-to-orchestrator.sh rules: - - if: '$CI_COMMIT_REF_NAME == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/' + - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/' package_arm64_deb: stage: build_packages @@ -85,7 +85,7 @@ package_arm64_deb: - earthly +package-linux-arm64-deb - /home/gitlab-runner/scp-to-orchestrator.sh rules: - - if: '$CI_COMMIT_REF_NAME == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/' + - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/' package_amd64_rpm: stage: build_packages @@ -98,7 +98,7 @@ package_amd64_rpm: - earthly +package-linux-amd64-rpm - /home/gitlab-runner/scp-to-orchestrator.sh rules: - - if: '$CI_COMMIT_REF_NAME == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/' + - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/' release_job: stage: release @@ -109,7 +109,7 @@ release_job: tag_name: '$CI_COMMIT_TAG' description: '$CI_COMMIT_TAG' rules: - - if: '$CI_COMMIT_REF_NAME == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/' + - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/' build_repositories: stage: distribute @@ -118,7 +118,7 @@ build_repositories: script: - /home/gitlab-runner/distribute-packages.sh rules: - - if: '$CI_COMMIT_REF_NAME == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/' + - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/' deploy_repos: stage: distribute @@ -129,7 +129,7 @@ deploy_repos: script: - /home/gitlab-runner/deploy-repo.sh rules: - - if: '$CI_COMMIT_REF_NAME == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/' + - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/' delete_build_machines: stage: distribute @@ -140,4 +140,4 @@ delete_build_machines: - /home/gitlab-runner/build-machine-ctl.sh delete arm64-deb - /home/gitlab-runner/build-machine-ctl.sh delete amd64-rpm rules: - - if: '$CI_COMMIT_REF_NAME == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/' \ No newline at end of file + - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/' \ No newline at end of file