Skip to content

Commit cd6a059

Browse files
committed
Point ci-toolkit back to release
Since a faulty `git-crypt` existed in the plugin at that commit and was thus picked up instead
1 parent 219a7c4 commit cd6a059

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.buildkite/commands/decrypt-secrets.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env_var_name=${1:-GIT_CONCEAL_SECRET_KEY}
1919
# If installed in the $PATH, execute it (replacing this current process)
2020
echo "Searching for git-conceal binary in PATH..."
2121
if command -v git-conceal &> /dev/null; then
22-
echo "git-conceal binary found in $PATH, running 'git-conceal unlock env:${env_var_name}'"
22+
echo "git-conceal binary found in PATH at $(command -v git-conceal). Running 'git-conceal unlock env:${env_var_name}'"
2323
git-conceal unlock "env:${env_var_name}"
2424
exit $?
2525
fi
@@ -28,13 +28,13 @@ INSTALL_DIR="${PWD}"
2828
echo "Searching for git-conceal binary in ${INSTALL_DIR}..."
2929
# If was already previously installed in INSTALL_DIR, execute it (replacing this current process)
3030
if [[ -x "${INSTALL_DIR}/git-conceal" ]]; then
31-
echo "git-conceal binary found in ${INSTALL_DIR}, running 'git-conceal unlock env:${env_var_name}'"
31+
echo "git-conceal binary found in ${INSTALL_DIR}. Running 'git-conceal unlock env:${env_var_name}'"
3232
"${INSTALL_DIR}/git-conceal" unlock "env:${env_var_name}"
3333
exit $?
3434
fi
3535

3636
# Otherwise, install it locally and execute it
37-
echo "git-conceal binary not found in ${INSTALL_DIR}, installing it..."
37+
echo "git-conceal binary not found in ${INSTALL_DIR}. Installing it..."
3838
mkdir -p "${INSTALL_DIR}"
3939
curl -fsSL https://raw.githubusercontent.com/Automattic/git-conceal/install-script/install.sh | bash -s -- --prefix "${INSTALL_DIR}"
4040
echo "git-conceal installed successfully"

.buildkite/shared-pipeline-vars

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# This file is `source`'d before calling `buildkite-agent pipeline upload`, and can be used
44
# to set up some variables that will be interpolated in the `.yml` pipeline before uploading it.
55

6-
# "git-crypt-unlock" branch / https://github.com/Automattic/a8c-ci-toolkit-buildkite-plugin/pull/195
7-
export CI_TOOLKIT="automattic/a8c-ci-toolkit#13e3bb6349f69fb78bf7157367be727489bb1fb2"
6+
export CI_TOOLKIT="automattic/a8c-ci-toolkit#5.7.0"
87
export TEST_COLLECTOR="test-collector#v1.10.1"
98
export CLAUDE_PLUGIN="claude-summarize#v1.1.0"

0 commit comments

Comments
 (0)