Skip to content

Commit

Permalink
squash me 2
Browse files Browse the repository at this point in the history
  • Loading branch information
karampok committed Jan 9, 2020
1 parent 5b33527 commit 2494f22
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .buildkite/hooks/pre-artifact
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ save "logs"
save "traces"
save "gen"
save "gen-cache"
save "test-artifacts"
save "/tmp/test-artifacts"

tar chaf "artifacts.out/$ARTIFACTS.tar.gz" -C artifacts "$ARTIFACTS"
rm -rf artifacts
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/hooks/pre-command
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euo pipefail

# ACCEPTANCE_ARTIFACTS is used for acceptance tests built with the "old"
# acceptance framework
export ACCEPTANCE_ARTIFACTS=test-artifacts
export ACCEPTANCE_ARTIFACTS=/tmp/test-artifacts

echo "Clean existing environment"
. .buildkite/hooks/pre-exit
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/hooks/pre-exit
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ docker network prune -f
echo "Remove leftover volumes"
docker volume prune -f

rm -rf bazel-testlogs logs/* traces gen gen-cache test-artifacts
rm -rf bazel-testlogs logs/* traces gen gen-cache /tmp/test-artifacts
16 changes: 8 additions & 8 deletions .buildkite/pipeline_buildlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,24 @@ steps:
- exit_status: 255 # Forced agent shutdown
- label: "Check generated go_deps.bzl file is up to date with go.mod"
command:
- mkdir -p ./test-artifacts
- cp go.mod go.sum go_deps.bzl ./test-artifacts/
- mkdir -p /tmp/test-artifacts
- cp go.mod go.sum go_deps.bzl /tmp/test-artifacts/
- make godeps -B
- bazel-${BUILDKITE_PIPELINE_SLUG}/external/go_sdk/bin/go mod tidy
- diff -u ./test-artifacts/go.mod go.mod
- diff -u ./test-artifacts/go.sum go.sum
- diff -u ./test-artifacts/go_deps.bzl go_deps.bzl
- diff -u /tmp/test-artifacts/go.mod go.mod
- diff -u /tmp/test-artifacts/go.sum go.sum
- diff -u /tmp/test-artifacts/go_deps.bzl go_deps.bzl
key: go_deps_lint
retry:
automatic:
- exit_status: -1 # Agent was lost
- exit_status: 255 # Forced agent shutdown
- label: "Check generated go/proto files in git"
command:
- mkdir -p ./test-artifacts
- cp -R go/proto/ ./test-artifacts/
- mkdir -p /tmp/test-artifacts
- cp -R go/proto/ /tmp/test-artifacts/
- make gogen
- diff -ur ./test-artifacts/proto/ go/proto/
- diff -ur /tmp/test-artifacts/proto/ go/proto/
key: go_gen_lint
retry:
automatic:
Expand Down

0 comments on commit 2494f22

Please sign in to comment.