Skip to content

Commit bc1d18d

Browse files
committed
git-crypt unlock before install_gems on CI
So that we decrypt things as early as possible in the CI jobs, now that `git-crypt` doesn't need Ruby to be installed first like `configure_apply` did. h/t @iangmaia#14979 (comment)
1 parent 63f3291 commit bc1d18d

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

.buildkite/commands/gradle-cache-build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ fi
1010

1111
"$(dirname "${BASH_SOURCE[0]}")/restore-cache.sh"
1212

13-
echo "--- :rubygems: Setting up Gems"
14-
install_gems
15-
1613
echo "--- :closed_lock_with_key: Decrypting Secrets"
1714
.buildkite/commands/git-crypt-unlock.sh
1815

16+
echo "--- :rubygems: Setting up Gems"
17+
install_gems
18+
1919
echo "--- :hammer_and_wrench: Building"
2020
./gradlew assembleWasabiDebug

.buildkite/commands/prototype-build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ fi
99

1010
APP_TO_BUILD="${1?You need to specify the app to build, WooCommerce or WooCommerce-Wear}"
1111

12-
echo "--- :rubygems: Setting up Gems"
13-
install_gems
14-
1512
echo "--- :closed_lock_with_key: Decrypting Secrets"
1613
.buildkite/commands/git-crypt-unlock.sh
1714

15+
echo "--- :rubygems: Setting up Gems"
16+
install_gems
17+
1818
echo "--- :hammer_and_wrench: Building ${APP_TO_BUILD}"
1919
bundle exec fastlane build_and_upload_prototype_build app:"${APP_TO_BUILD}"

.buildkite/commands/release-build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
APP_TO_BUILD="${1?You need to specify the app to build, WooCommerce or WooCommerce-Wear}"
44

5-
echo "--- :rubygems: Setting up Gems"
6-
install_gems
7-
85
echo "--- :closed_lock_with_key: Decrypting Secrets"
96
.buildkite/commands/git-crypt-unlock.sh
107

8+
echo "--- :rubygems: Setting up Gems"
9+
install_gems
10+
1111
echo "--- :hammer_and_wrench: Building ${APP_TO_BUILD}"
1212
bundle exec fastlane build_and_upload_google_play app:"${APP_TO_BUILD}"

.buildkite/commands/run-instrumented-tests.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ fi
88

99
"$(dirname "${BASH_SOURCE[0]}")/restore-cache.sh"
1010

11-
echo "--- :rubygems: Setting up Gems"
12-
install_gems
13-
1411
echo "--- :closed_lock_with_key: Decrypting Secrets"
1512
.buildkite/commands/git-crypt-unlock.sh
1613

14+
echo "--- :rubygems: Setting up Gems"
15+
install_gems
16+
1717
echo "--- 🧪 Testing"
1818
set +e
1919
bundle exec fastlane build_and_instrumented_test

.buildkite/commands/run-unit-tests.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ fi
88

99
"$(dirname "${BASH_SOURCE[0]}")/restore-cache.sh"
1010

11-
echo "--- :rubygems: Setting up Gems"
12-
install_gems
13-
1411
echo "--- :closed_lock_with_key: Decrypting Secrets"
1512
.buildkite/commands/git-crypt-unlock.sh
1613

14+
echo "--- :rubygems: Setting up Gems"
15+
install_gems
16+
1717
echo "+++ 🧪 Testing"
1818
set +e
1919
./gradlew testJalapenoDebugUnitTest testDebugUnitTest jacocoTestReport

.buildkite/release-pipelines/download-release-translations.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ steps:
1010
1111
.buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
1212
13-
echo '--- :ruby: Setup Ruby Tools'
14-
install_gems
15-
1613
echo '--- :closed_lock_with_key: Decrypting Secrets'
1714
.buildkite/commands/git-crypt-unlock.sh
1815
16+
echo '--- :ruby: Setup Ruby Tools'
17+
install_gems
18+
1919
echo '--- :globe_with_meridians: Download Release Translations'
2020
bundle exec fastlane download_release_translations skip_confirm:true include_wear_app:"${INCLUDE_WEAR_APP:-false}"
2121
agents:

.buildkite/release-pipelines/finalize-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ steps:
1010
1111
.buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
1212
13-
echo '--- :ruby: Setup Ruby Tools'
14-
install_gems
15-
1613
echo '--- :closed_lock_with_key: Decrypting Secrets'
1714
.buildkite/commands/git-crypt-unlock.sh
1815
16+
echo '--- :ruby: Setup Ruby Tools'
17+
install_gems
18+
1919
echo '--- :shipit: Finalize Release'
2020
bundle exec fastlane finalize_release skip_confirm:true include_wear_app:"${INCLUDE_WEAR_APP:-false}"
2121
agents:

0 commit comments

Comments
 (0)