Skip to content

Commit d5070aa

Browse files
authored
Updated pre-command script (#348)
1 parent 38e0d52 commit d5070aa

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

.buildkite/hooks/pre-command

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ GITHUB_TOKEN_VAULT_PATH="kv/ci-shared/platform-ingest/github_token"
1111
# Secrets must be redacted
1212
# https://buildkite.com/docs/pipelines/managing-log-output#redacted-environment-variables
1313

14-
if [[ "$BUILDKITE_PIPELINE_SLUG" == "golang-crossbuild" && "$BUILDKITE_STEP_KEY" == build* ]]; then
14+
if [[ "$BUILDKITE_PIPELINE_SLUG" == "golang-crossbuild" && ( "$BUILDKITE_STEP_KEY" == build* || "$BUILDKITE_STEP_KEY" == release* ) ]]; then
1515
export PRIVATE_CI_GCS_CREDENTIALS_SECRET=$(retry 5 vault kv get -field plaintext ${PRIVATE_CI_GCS_CREDENTIALS_PATH})
1616
fi
1717

@@ -26,10 +26,3 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "golang-crossbuild" && "$BUILDKITE_STEP_KEY"
2626
export GITHUB_USERNAME_SECRET=$(retry 5 vault kv get -field username ${GITHUB_TOKEN_VAULT_PATH})
2727
export GITHUB_EMAIL_SECRET=$(retry 5 vault kv get -field email ${GITHUB_TOKEN_VAULT_PATH})
2828
fi
29-
30-
if [[ "$BUILDKITE_PIPELINE_SLUG" == "llvm-apple" && ("$BUILDKITE_STEP_KEY" =~ ^build)]]; then
31-
# export PRIVATE_CI_GCS_CREDENTIALS_SECRET=$(retry 5 vault kv get -field plaintext ${PRIVATE_CI_GCS_CREDENTIALS_PATH})
32-
export DOCKER_USERNAME_SECRET=$(retry 5 vault kv get -field user "${DOCKER_REGISTRY_SECRET_PATH}")
33-
export DOCKER_PASSWORD_SECRET=$(retry 5 vault kv get -field password "${DOCKER_REGISTRY_SECRET_PATH}")
34-
docker login -u "${DOCKER_USERNAME_SECRET}" -p "${DOCKER_PASSWORD_SECRET}" "${DOCKER_REGISTRY}" 2>/dev/null
35-
fi

.buildkite/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ steps:
9494
context: "Release / Ubuntu ARM"
9595

9696
- label: "Post-Release"
97-
key: "post-release"
97+
key: "release-post"
9898
command: ".buildkite/scripts/post-release.sh ${GOLANG_VERSION}"
9999
if: build.branch == "main" || build.branch =~ /^[0-9]+\.[0-9]+$$/
100100
depends_on:

0 commit comments

Comments
 (0)