Skip to content

Commit f71da3a

Browse files
committed
ci: move Buildkite cache setup into pre-command hook
1 parent 3acff56 commit f71da3a

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env bash
2-
32
set -euo pipefail
43

54
checkout_path="${BUILDKITE_BUILD_CHECKOUT_PATH:-$(pwd)}"

.buildkite/pipeline.release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ steps:
1919
- OAUTH_CLIENT_ID
2020
env:
2121
GOOS: "{{matrix}}"
22-
command: '. .buildkite/cache-env.sh && .buildkite/release.sh release --clean --split'
22+
command: '.buildkite/release.sh release --clean --split'
2323
plugins:
2424
- *mise_plugin
2525

@@ -59,4 +59,4 @@ steps:
5959
download:
6060
- dist/**/*
6161
- *mise_plugin
62-
command: '. .buildkite/cache-env.sh && .buildkite/release.sh continue --merge'
62+
command: '.buildkite/release.sh continue --merge'

.buildkite/pipeline.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@ cache: ".buildkite/cache-volume"
88

99
steps:
1010
- name: ":golangci-lint: lint"
11-
command: '. .buildkite/cache-env.sh && golangci-lint run --verbose --timeout 3m'
11+
command: 'golangci-lint run --verbose --timeout 3m'
1212
plugins:
1313
- *mise_plugin
1414

1515
- name: ":go: test"
1616
artifact_paths:
1717
- cover-tree.svg
18+
env:
19+
BUILDKITE_API_TOKEN: ""
20+
BUILDKITE_ORGANIZATION_SLUG: ""
1821
commands:
19-
- . .buildkite/cache-env.sh
20-
- unset BUILDKITE_ORGANIZATION_SLUG BUILDKITE_API_TOKEN
2122
- go test -coverprofile cover.out ./...
2223
- go run github.com/nikolaydubina/go-cover-treemap@v1.5.1 -coverprofile cover.out > cover-tree.svg
2324
- echo '<details><summary>Coverage tree map</summary><img src="artifact://cover-tree.svg" alt="Test coverage tree map" width="70%"></details>' | buildkite-agent annotate --style "info"
@@ -38,7 +39,7 @@ steps:
3839
- OAUTH_CLIENT_ID
3940
env:
4041
GOOS: "{{matrix}}"
41-
command: '. .buildkite/cache-env.sh && .buildkite/release.sh release --clean --snapshot --split'
42+
command: '.buildkite/release.sh release --clean --snapshot --split'
4243
plugins:
4344
- *mise_plugin
4445

0 commit comments

Comments
 (0)