Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions .github/buildomat/build-and-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@ set -o errexit
set -o pipefail
set -o xtrace

# Color the output for easier readability.
export CARGO_TERM_COLOR=always
#
# Set up our PATH for the test suite.
#

# shellcheck source=/dev/null
source ./env.sh
# shellcheck source=/dev/null
source .github/buildomat/ci-env.sh

target_os=$1

Expand All @@ -30,10 +36,7 @@ OUTPUT_DIR='/work'
echo "tests will store non-ephemeral output in $OUTPUT_DIR" >&2
mkdir -p "$OUTPUT_DIR"

#
# Set up our PATH for the test suite.
#
source ./env.sh


banner prerequisites
ptime -m bash ./tools/install_builder_prerequisites.sh -y
Expand Down
6 changes: 6 additions & 0 deletions .github/buildomat/ci-env.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Setup shared across Buildomat CI builds.
#
# This file contains environment variables shared across Buildomat CI jobs.

# Color the output for easier readability.
export CARGO_TERM_COLOR=always
3 changes: 3 additions & 0 deletions .github/buildomat/jobs/a4x2-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ set -o errexit
set -o pipefail
set -o xtrace

# shellcheck source=/dev/null
source .github/buildomat/ci-env.sh

pfexec mkdir -p /out
pfexec chown "$UID" /out

Expand Down
4 changes: 3 additions & 1 deletion .github/buildomat/jobs/a4x2-prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
#: ]
#: enable = false

# shellcheck source=/dev/null
source ./env.sh
# shellcheck source=/dev/null
source .github/buildomat/ci-env.sh

set -o errexit
set -o pipefail
Expand Down Expand Up @@ -91,4 +94,3 @@ for x in ce cr1 cr2 g0 g1 g2 g3 tools omicron-common; do
tar -czf cargo-bay-$x.tgz cargo-bay/$x
mv cargo-bay-$x.tgz /out/
done

3 changes: 3 additions & 0 deletions .github/buildomat/jobs/check-features.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ set -o errexit
set -o pipefail
set -o xtrace

# shellcheck source=/dev/null
source .github/buildomat/ci-env.sh

cargo --version
rustc --version

Expand Down
10 changes: 7 additions & 3 deletions .github/buildomat/jobs/clippy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,17 @@ set -o errexit
set -o pipefail
set -o xtrace

cargo --version
rustc --version

#
# Set up our PATH for use with this workspace.
#

# shellcheck source=/dev/null
source ./env.sh
# shellcheck source=/dev/null
source .github/buildomat/ci-env.sh

cargo --version
rustc --version

banner prerequisites
ptime -m bash ./tools/install_builder_prerequisites.sh -y
Expand Down
3 changes: 3 additions & 0 deletions .github/buildomat/jobs/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@ cd /opt/oxide/work

ptime -m tar xvzf /input/package/work/package.tar.gz

# shellcheck source=/dev/null
source .github/buildomat/ci-env.sh

# Ask buildomat for the range of extra addresses that we're allowed to use, and
# break them up into the ranges we need.

Expand Down
3 changes: 3 additions & 0 deletions .github/buildomat/jobs/omicron-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ set -o errexit
set -o pipefail
set -o xtrace

# shellcheck source=/dev/null
source .github/buildomat/ci-env.sh

cargo --version
rustc --version

Expand Down
4 changes: 4 additions & 0 deletions .github/buildomat/jobs/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ set -o errexit
set -o pipefail
set -o xtrace

# shellcheck source=/dev/null
source .github/buildomat/ci-env.sh

cargo --version
rustc --version

Expand Down Expand Up @@ -48,6 +51,7 @@ mkdir tests
# deployment phases of buildomat.

files=(
.github/buildomat/ci-env.sh
out/target/test
out/npuzone/*
package-manifest.toml
Expand Down
3 changes: 3 additions & 0 deletions .github/buildomat/jobs/tuf-repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ set -o errexit
set -o pipefail
set -o xtrace

# shellcheck source=/dev/null
source .github/buildomat/ci-env.sh

cargo --version
rustc --version

Expand Down
Loading