File tree Expand file tree Collapse file tree 10 files changed +44
-10
lines changed Expand file tree Collapse file tree 10 files changed +44
-10
lines changed Original file line number Diff line number Diff line change @@ -4,8 +4,14 @@ set -o errexit
44set -o pipefail
55set -o xtrace
66
7- # Color the output for easier readability.
8- export CARGO_TERM_COLOR=always
7+ #
8+ # Set up our PATH for the test suite.
9+ #
10+
11+ # shellcheck source=/dev/null
12+ source ./env.sh
13+ # shellcheck source=/dev/null
14+ source .github/buildomat/ci-env.sh
915
1016target_os=$1
1117
@@ -30,10 +36,7 @@ OUTPUT_DIR='/work'
3036echo " tests will store non-ephemeral output in $OUTPUT_DIR " >&2
3137mkdir -p " $OUTPUT_DIR "
3238
33- #
34- # Set up our PATH for the test suite.
35- #
36- source ./env.sh
39+
3740
3841banner prerequisites
3942ptime -m bash ./tools/install_builder_prerequisites.sh -y
Original file line number Diff line number Diff line change 1+ # Setup shared across Buildomat CI builds.
2+ #
3+ # This file contains environment variables shared across Buildomat CI jobs.
4+
5+ # Color the output for easier readability.
6+ export CARGO_TERM_COLOR=always
Original file line number Diff line number Diff line change @@ -21,6 +21,9 @@ set -o errexit
2121set -o pipefail
2222set -o xtrace
2323
24+ # shellcheck source=/dev/null
25+ source .github/buildomat/ci-env.sh
26+
2427pfexec mkdir -p /out
2528pfexec chown " $UID " /out
2629
Original file line number Diff line number Diff line change 2222# : ]
2323# : enable = false
2424
25+ # shellcheck source=/dev/null
2526source ./env.sh
27+ # shellcheck source=/dev/null
28+ source .github/buildomat/ci-env.sh
2629
2730set -o errexit
2831set -o pipefail
@@ -91,4 +94,3 @@ for x in ce cr1 cr2 g0 g1 g2 g3 tools omicron-common; do
9194 tar -czf cargo-bay-$x .tgz cargo-bay/$x
9295 mv cargo-bay-$x .tgz /out/
9396done
94-
Original file line number Diff line number Diff line change @@ -14,6 +14,9 @@ set -o errexit
1414set -o pipefail
1515set -o xtrace
1616
17+ # shellcheck source=/dev/null
18+ source .github/buildomat/ci-env.sh
19+
1720cargo --version
1821rustc --version
1922
Original file line number Diff line number Diff line change @@ -16,13 +16,17 @@ set -o errexit
1616set -o pipefail
1717set -o xtrace
1818
19- cargo --version
20- rustc --version
21-
2219#
2320# Set up our PATH for use with this workspace.
2421#
22+
23+ # shellcheck source=/dev/null
2524source ./env.sh
25+ # shellcheck source=/dev/null
26+ source .github/buildomat/ci-env.sh
27+
28+ cargo --version
29+ rustc --version
2630
2731banner prerequisites
2832ptime -m bash ./tools/install_builder_prerequisites.sh -y
Original file line number Diff line number Diff line change @@ -194,6 +194,9 @@ cd /opt/oxide/work
194194
195195ptime -m tar xvzf /input/package/work/package.tar.gz
196196
197+ # shellcheck source=/dev/null
198+ source .github/buildomat/ci-env.sh
199+
197200# Ask buildomat for the range of extra addresses that we're allowed to use, and
198201# break them up into the ranges we need.
199202
Original file line number Diff line number Diff line change @@ -14,6 +14,9 @@ set -o errexit
1414set -o pipefail
1515set -o xtrace
1616
17+ # shellcheck source=/dev/null
18+ source .github/buildomat/ci-env.sh
19+
1720cargo --version
1821rustc --version
1922
Original file line number Diff line number Diff line change @@ -13,6 +13,9 @@ set -o errexit
1313set -o pipefail
1414set -o xtrace
1515
16+ # shellcheck source=/dev/null
17+ source .github/buildomat/ci-env.sh
18+
1619cargo --version
1720rustc --version
1821
@@ -48,6 +51,7 @@ mkdir tests
4851# deployment phases of buildomat.
4952
5053files=(
54+ .github/buildomat/ci-env.sh
5155 out/target/test
5256 out/npuzone/*
5357 package-manifest.toml
Original file line number Diff line number Diff line change @@ -47,6 +47,9 @@ set -o errexit
4747set -o pipefail
4848set -o xtrace
4949
50+ # shellcheck source=/dev/null
51+ source .github/buildomat/ci-env.sh
52+
5053cargo --version
5154rustc --version
5255
You can’t perform that action at this time.
0 commit comments