From 757b26866bc00790811008113057b00a2093e8a1 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 4 Sep 2024 14:51:59 +1000 Subject: [PATCH] Inline simplified complete-code-freeze.sh in pipeline --- .buildkite/commands/complete-code-freeze.sh | 12 ------------ .../release-pipelines/complete-code-freeze.yml | 12 +++++++++++- 2 files changed, 11 insertions(+), 13 deletions(-) delete mode 100755 .buildkite/commands/complete-code-freeze.sh diff --git a/.buildkite/commands/complete-code-freeze.sh b/.buildkite/commands/complete-code-freeze.sh deleted file mode 100755 index 56089a0c0..000000000 --- a/.buildkite/commands/complete-code-freeze.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -eu - -.buildkite/commands/configure-environment.sh - -echo '--- :git: Checkout release branch' -.buildkite/commands/checkout-release-branch.sh - -echo '--- :closed_lock_with_key: Access secrets' -bundle exec fastlane run configure_apply - -echo '--- :shipit: Complete code freeze' -bundle exec fastlane complete_code_freeze skip_confirm:true diff --git a/.buildkite/release-pipelines/complete-code-freeze.yml b/.buildkite/release-pipelines/complete-code-freeze.yml index 3011ce954..537241362 100644 --- a/.buildkite/release-pipelines/complete-code-freeze.yml +++ b/.buildkite/release-pipelines/complete-code-freeze.yml @@ -14,7 +14,17 @@ steps: - label: Complete Code Freeze key: complete_code_freeze plugins: [$CI_TOOLKIT_PLUGIN] - command: .buildkite/commands/complete-code-freeze.sh $RELEASE_VERSION + command: | + .buildkite/commands/configure-environment.sh + + echo '--- :git: Checkout release branch' + .buildkite/commands/checkout-release-branch.sh + + echo '--- :closed_lock_with_key: Access secrets' + bundle exec fastlane run configure_apply + + echo '--- :shipit: Complete code freeze' + bundle exec fastlane complete_code_freeze skip_confirm:true retry: manual: # If failed, we prefer retrying via ReleaseV2 rather than Buildkite.