Skip to content

Commit 05da00f

Browse files
committed
[bazel] Remove bazel fetch from airgap preparation
No longer needed now that all external dependencies are managed by Bzlmod and downloaded using `bazel vendor`. Signed-off-by: James Wainwright <[email protected]>
1 parent c67113d commit 05da00f

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

ci/scripts/test-airgapped-build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ sudo ip netns exec airgapped sudo -u "$USER" \
3030
BITSTREAM="--offline latest" \
3131
"${PWD}/bazel-airgapped/bazel" build \
3232
--distdir="${PWD}/bazel-airgapped/bazel-distdir" \
33-
--repository_cache="${PWD}/bazel-airgapped/bazel-cache" \
3433
--vendor_dir="${PWD}/bazel-airgapped/bazel-vendor" \
3534
--define DISABLE_VERILATOR_BUILD=true \
3635
//sw/device/silicon_creator/rom:mask_rom

util/prep-bazel-airgapped-build.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,6 @@ if [[ ${AIRGAPPED_DIR_CONTENTS} == "ALL" || \
138138
mkdir -p ${BAZEL_AIRGAPPED_DIR}/${BAZEL_CACHEDIR}
139139
# Make bazel forget everything it knows, then download everything.
140140
${BAZELISK} clean --expunge
141-
${BAZELISK} fetch \
142-
--repository_cache=${BAZEL_AIRGAPPED_DIR}/${BAZEL_CACHEDIR} \
143-
//...
144141
${BAZELISK} vendor --vendor_dir=${BAZEL_AIRGAPPED_DIR}/${BAZEL_VENDORDIR} //...
145142
# We don't need all bitstreams in the cache, we just need the latest one so
146143
# that the cache is "initialized" and "offline" mode will work correctly.
@@ -166,5 +163,5 @@ if [[ ${AIRGAPPED_DIR_CONTENTS} == "ALL" ]]; then
166163
echo $LINE_SEP
167164
echo "To perform an airgapped build, ship the contents of ${BAZEL_AIRGAPPED_DIR} to your airgapped environment and then:"
168165
echo ""
169-
echo "bazel build --distdir=${BAZEL_AIRGAPPED_DIR}/${BAZEL_DISTDIR} --repository_cache=${BAZEL_AIRGAPPED_DIR}/${BAZEL_CACHEDIR} --vendor_dir=${BAZEL_AIRGAPPED_DIR}/${BAZEL_VENDORDIR} <label>"
166+
echo "bazel build --distdir=${BAZEL_AIRGAPPED_DIR}/${BAZEL_DISTDIR} --vendor_dir=${BAZEL_AIRGAPPED_DIR}/${BAZEL_VENDORDIR} <label>"
170167
fi

0 commit comments

Comments
 (0)