Skip to content

Commit

Permalink
Streamline buildkite configuration a bit (#41494)
Browse files Browse the repository at this point in the history
* Add `/cache/repos` as a mapping into the CI sandbox

This should allow `git` to find its cached objects properly, which
should silence the warnings on CI, and also give us the proper git
version info within buildkite builds

* Break up `llvmpasses` output a bit

* Provide `/cache/repos` for `whitespace` as well

* Give a positive message if whitespace check passes

It's a little unnerving to have a silent command block in buildkite, so
let's output a success message if everything is on the up-and-up

(cherry picked from commit 460e981)
  • Loading branch information
staticfloat committed Dec 22, 2022
1 parent cbb855f commit ef8a6b8
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .buildkite/embedding.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ steps:
rootfs_treehash: "f3ed53f159e8f13edfba8b20ebdb8ece73c1b8a8"
uid: 1000
gid: 1000
workspaces:
# Include `/cache/repos` so that our `git` version introspection works.
- "/cache/repos:/cache/repos"
commands: |
prefix="/tmp/prefix"
echo "+++ Build julia, deploy to $${prefix}"
Expand Down
9 changes: 8 additions & 1 deletion .buildkite/llvm_passes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ steps:
- staticfloat/sandbox#v1:
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v1/llvm-passes.tar.gz
rootfs_treehash: "f3ed53f159e8f13edfba8b20ebdb8ece73c1b8a8"
workspaces:
# Include `/cache/repos` so that our `git` version introspection works.
- "/cache/repos:/cache/repos"
commands: |
echo "--- Install in-tree LLVM dependencies"
make -j$${JULIA_NUM_CORES} -C deps install-llvm install-clang install-llvm-tools install-libuv install-utf8proc install-unwind
Expand All @@ -37,10 +40,14 @@ steps:
rootfs_treehash: "f3ed53f159e8f13edfba8b20ebdb8ece73c1b8a8"
uid: 1000
gid: 1000
workspaces:
- "/cache/repos:/cache/repos"
commands: |
echo "+++ run llvmpasses"
echo "--- make release"
make -j$${JULIA_NUM_CORES} release JULIA_PRECOMPILE=0
echo "--- make src/install-analysis-deps"
make -j$${JULIA_NUM_CORES} -C src install-analysis-deps
echo "+++ make test/llvmpasses"
make -j$${JULIA_NUM_CORES} -C test/llvmpasses
timeout_in_minutes: 60
notify:
Expand Down
2 changes: 2 additions & 0 deletions .buildkite/whitespace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ steps:
- staticfloat/sandbox#v1:
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v1/llvm-passes.tar.gz
rootfs_treehash: "f3ed53f159e8f13edfba8b20ebdb8ece73c1b8a8"
workspaces:
- "/cache/repos:/cache/repos"
commands: |
make -j$${JULIA_NUM_CORES} check-whitespace
timeout_in_minutes: 10
Expand Down
2 changes: 2 additions & 0 deletions contrib/check-whitespace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@ if git --no-pager grep --color -n --full-name -e ' $' -- $file_patterns; then
echo "and then a forced push of the correct branch"
exit 1
fi

echo "Whitespace check found no issues"

0 comments on commit ef8a6b8

Please sign in to comment.