Skip to content

Commit c04f629

Browse files
author
Jason Heath
committed
Restores core/rust/"$toolchain" removing "unstable" core/rust/1.79.0/20250606210134
Signed-off-by: Jason Heath <[email protected]>
1 parent 4df0f4b commit c04f629

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

components/builder-api/habitat/plan.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ pkg_build_deps=(
2828
core/pkg-config
2929
core/protobuf-cpp
3030
core/protobuf-rust
31-
# core/rust/"$(tail -n 1 "../../../rust-toolchain" | cut -d'"' -f 2)"
32-
core/rust/1.79.0/20250606210134
31+
core/rust/"$(tail -n 1 "../../../rust-toolchain" | cut -d'"' -f 2)"
3332
)
3433

3534
pkg_exports=(

support/ci/platform-inspection.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,10 @@ else
7070
fi
7171
echo ""
7272

73-
# CMD="$(hab pkg path core/rust/"$toolchain")/bin/cargo-clippy"
74-
CMD="$(hab pkg path core/rust/1.79.0/20250606210134)/bin/cargo-clippy"
73+
# shellcheck source=./shared.sh
74+
source ./support/ci/shared.s
75+
toolchain=$(get_toolchain)
76+
CMD="$(hab pkg path core/rust/"$toolchain")/bin/cargo-clippy"
7577
readonly CMD
7678
if command -v ldd >/dev/null 2>&1; then
7779

support/ci/shared_build_environment.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ toolchain=$(get_toolchain)
1010
eval "$(hab pkg env core/rust/"$toolchain")"
1111
PATH=$PATH:$OG_PATH
1212

13-
# install_hab_pkg core/rust/"$toolchain"
14-
sudo -E hab pkg install core/rust/1.79.0/20250606210134 --channel unstable
13+
install_hab_pkg core/rust/"$toolchain"
1514
install_hab_pkg core/glibc
1615
install_hab_pkg core/gcc-base
1716
install_hab_pkg core/binutils
@@ -23,6 +22,7 @@ install_hab_pkg core/diffutils
2322
install_hab_pkg core/gawk
2423
install_hab_pkg core/git
2524
install_hab_pkg core/grep
25+
install_hab_pkg core/hab-ld-wrapper
2626
install_hab_pkg core/libarchive
2727
install_hab_pkg core/libb2
2828
install_hab_pkg core/libsodium
@@ -91,14 +91,15 @@ prepend_path+=":$(hab pkg path core/diffutils)/bin"
9191
prepend_path+=":$(hab pkg path core/gawk)/bin"
9292
prepend_path+=":$(hab pkg path core/git)/bin"
9393
prepend_path+=":$(hab pkg path core/grep)/bin"
94+
prepend_path+=":$(hab pkg path core/hab-ld-wrapper)/bin"
9495
prepend_path+=":$(hab pkg path core/libarchive)/bin"
9596
prepend_path+=":$(hab pkg path core/make)/bin"
9697
prepend_path+=":$(hab pkg path core/cmake)/bin"
9798
prepend_path+=":$(hab pkg path core/openssl)/bin"
9899
prepend_path+=":$(hab pkg path core/pkg-config)/bin"
99100
prepend_path+=":$(hab pkg path core/postgresql17)/bin"
100101
prepend_path+=":$(hab pkg path core/protobuf)/bin"
101-
prepend_path+=":$(hab pkg path core/rust/1.79.0/20250606210134)/bin"
102+
prepend_path+=":$(hab pkg path core/rust/"$toolchain")/bin"
102103
prepend_path+=":$(hab pkg path core/sed)/bin"
103104
prepend_path+=":$(hab pkg path core/sudo)/bin"
104105
prepend_path+=":$(hab pkg path core/zeromq)/bin"

0 commit comments

Comments
 (0)