From 63e95db8e5c295a4d8a295d51c44bbc5d1f51b8b Mon Sep 17 00:00:00 2001 From: Jon Bauman <5906042+baumanj@users.noreply.github.com> Date: Fri, 21 Jun 2019 18:13:27 -0700 Subject: [PATCH 1/3] Make the hab plan's rust build dep correspond to the rust-toolchain version Signed-off-by: Jon Bauman <5906042+baumanj@users.noreply.github.com> --- components/hab/habitat/plan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/hab/habitat/plan.sh b/components/hab/habitat/plan.sh index 0d058dd0d7..dc4c9506ab 100644 --- a/components/hab/habitat/plan.sh +++ b/components/hab/habitat/plan.sh @@ -15,7 +15,7 @@ pkg_build_deps=(core/musl core/openssl-musl core/libsodium-musl core/coreutils - core/rust + core/rust/"$(cat "$SRC_PATH/../../rust-toolchain")" core/gcc) pkg_bin_dirs=(bin) From 32b6c52acb6f5290cde2e9de0f42ca2770c70b43 Mon Sep 17 00:00:00 2001 From: mwrock Date: Mon, 24 Jun 2019 12:08:02 -0700 Subject: [PATCH 2/3] pin to rust-toolchain in ps1 plans Signed-off-by: mwrock --- components/hab/habitat/plan.ps1 | 2 +- components/launcher/habitat/plan.ps1 | 2 +- components/pkg-export-docker/habitat/plan.ps1 | 2 +- components/pkg-export-tar/habitat/plan.ps1 | 2 +- components/sup/habitat/plan.ps1 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/hab/habitat/plan.ps1 b/components/hab/habitat/plan.ps1 index 59a2cd969f..3fc31e6fca 100644 --- a/components/hab/habitat/plan.ps1 +++ b/components/hab/habitat/plan.ps1 @@ -14,7 +14,7 @@ $pkg_deps=@( $pkg_bin_dirs = @("bin") $pkg_build_deps = @( "core/visual-cpp-build-tools-2015", - "core/rust", + "core/rust/$(Get-Content "$PLAN_CONTEXT/../../../rust-toolchain")", "core/cacerts" ) diff --git a/components/launcher/habitat/plan.ps1 b/components/launcher/habitat/plan.ps1 index 368dfcc1e4..f07f8b3a61 100644 --- a/components/launcher/habitat/plan.ps1 +++ b/components/launcher/habitat/plan.ps1 @@ -13,7 +13,7 @@ $pkg_bin_dirs = @("bin") $pkg_build_deps = @( "core/visual-cpp-redist-2015", "core/visual-cpp-build-tools-2015", - "core/rust", + "core/rust/$(Get-Content "$PLAN_CONTEXT/../../../rust-toolchain")", "core/cacerts", "core/git" ) diff --git a/components/pkg-export-docker/habitat/plan.ps1 b/components/pkg-export-docker/habitat/plan.ps1 index aea4e0c1d9..dabbf998b0 100644 --- a/components/pkg-export-docker/habitat/plan.ps1 +++ b/components/pkg-export-docker/habitat/plan.ps1 @@ -15,7 +15,7 @@ $pkg_deps=@( ) $pkg_build_deps = @( "core/visual-cpp-build-tools-2015", - "core/rust", + "core/rust/$(Get-Content "$PLAN_CONTEXT/../../../rust-toolchain")", "core/cacerts" ) diff --git a/components/pkg-export-tar/habitat/plan.ps1 b/components/pkg-export-tar/habitat/plan.ps1 index c40ca0accf..cd712625de 100644 --- a/components/pkg-export-tar/habitat/plan.ps1 +++ b/components/pkg-export-tar/habitat/plan.ps1 @@ -15,7 +15,7 @@ $pkg_deps=@( ) $pkg_build_deps = @( "core/visual-cpp-build-tools-2015", - "core/rust", + "core/rust/$(Get-Content "$PLAN_CONTEXT/../../../rust-toolchain")", "core/cacerts" ) diff --git a/components/sup/habitat/plan.ps1 b/components/sup/habitat/plan.ps1 index 5f45c85fac..f806c2777e 100644 --- a/components/sup/habitat/plan.ps1 +++ b/components/sup/habitat/plan.ps1 @@ -16,7 +16,7 @@ $pkg_deps=@( ) $pkg_build_deps = @( "core/visual-cpp-build-tools-2015", - "core/rust", + "core/rust/$(Get-Content "$PLAN_CONTEXT/../../../rust-toolchain")", "core/cacerts", "core/raml2html" ) From ae06c4f1ef6437ecc60c0604ab5f0a577415c6d8 Mon Sep 17 00:00:00 2001 From: Jon Bauman <5906042+baumanj@users.noreply.github.com> Date: Mon, 24 Jun 2019 14:43:32 -0700 Subject: [PATCH 3/3] Make the plan.sh's use rust-toolchain version This should update all the remaining plan.sh-based habitat component plans to use the rust-toolchain file to set the version of their core/rust build dependency. Signed-off-by: Jon Bauman <5906042+baumanj@users.noreply.github.com> --- components/launcher/habitat/plan.sh | 2 +- components/pkg-export-docker/habitat/plan.sh | 2 +- components/pkg-export-helm/habitat/plan.sh | 2 +- components/pkg-export-kubernetes/habitat/plan.sh | 2 +- components/pkg-export-tar/habitat/plan.sh | 2 +- components/sup/habitat/plan.sh | 2 +- components/sup/static/plan.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/launcher/habitat/plan.sh b/components/launcher/habitat/plan.sh index 1bfcbac2ac..12a80075f2 100644 --- a/components/launcher/habitat/plan.sh +++ b/components/launcher/habitat/plan.sh @@ -10,7 +10,7 @@ pkg_deps=(core/glibc core/libsodium core/openssl) pkg_build_deps=(core/coreutils - core/rust + core/rust/"$(cat "$SRC_PATH/../../rust-toolchain")" core/gcc core/git core/protobuf) diff --git a/components/pkg-export-docker/habitat/plan.sh b/components/pkg-export-docker/habitat/plan.sh index c353502511..c5730870e8 100644 --- a/components/pkg-export-docker/habitat/plan.sh +++ b/components/pkg-export-docker/habitat/plan.sh @@ -16,7 +16,7 @@ pkg_build_deps=(core/musl core/openssl-musl core/libsodium-musl core/coreutils - core/rust + core/rust/"$(cat "$SRC_PATH/../../rust-toolchain")" core/gcc core/make) pkg_bin_dirs=(bin) diff --git a/components/pkg-export-helm/habitat/plan.sh b/components/pkg-export-helm/habitat/plan.sh index 913db1e080..d2880c9dc1 100644 --- a/components/pkg-export-helm/habitat/plan.sh +++ b/components/pkg-export-helm/habitat/plan.sh @@ -15,7 +15,7 @@ pkg_build_deps=(core/musl core/openssl-musl core/libsodium-musl core/coreutils - core/rust + core/rust/"$(cat "$SRC_PATH/../../rust-toolchain")" core/gcc core/make) pkg_bin_dirs=(bin) diff --git a/components/pkg-export-kubernetes/habitat/plan.sh b/components/pkg-export-kubernetes/habitat/plan.sh index 051e1bb46b..01bfab5538 100644 --- a/components/pkg-export-kubernetes/habitat/plan.sh +++ b/components/pkg-export-kubernetes/habitat/plan.sh @@ -14,7 +14,7 @@ pkg_build_deps=(core/musl core/openssl-musl core/libsodium-musl core/coreutils - core/rust + core/rust/"$(cat "$SRC_PATH/../../rust-toolchain")" core/gcc core/make) pkg_bin_dirs=(bin) diff --git a/components/pkg-export-tar/habitat/plan.sh b/components/pkg-export-tar/habitat/plan.sh index df20df0010..563ab362ea 100644 --- a/components/pkg-export-tar/habitat/plan.sh +++ b/components/pkg-export-tar/habitat/plan.sh @@ -14,7 +14,7 @@ pkg_build_deps=(core/musl core/openssl-musl core/libsodium-musl core/coreutils - core/rust + core/rust/"$(cat "$SRC_PATH/../../rust-toolchain")" core/gcc core/make) pkg_bin_dirs=(bin) diff --git a/components/sup/habitat/plan.sh b/components/sup/habitat/plan.sh index 3880650e33..ff79f37604 100644 --- a/components/sup/habitat/plan.sh +++ b/components/sup/habitat/plan.sh @@ -15,7 +15,7 @@ pkg_deps=(core/busybox-static pkg_build_deps=(core/coreutils core/cacerts core/make - core/rust + core/rust/"$(cat "$SRC_PATH/../../rust-toolchain")" core/gcc core/raml2html core/protobuf) diff --git a/components/sup/static/plan.sh b/components/sup/static/plan.sh index 5f772b00f4..c60d6caee3 100644 --- a/components/sup/static/plan.sh +++ b/components/sup/static/plan.sh @@ -7,7 +7,7 @@ pkg_deps=(core/busybox-static) pkg_build_deps=( core/musl core/zlib-musl core/xz-musl core/bzip2-musl core/libarchive-musl core/openssl-musl core/libsodium-musl - core/coreutils core/cacerts core/rust core/gcc + core/coreutils core/cacerts core/rust/"$(cat "$SRC_PATH/../../../rust-toolchain")" core/gcc ) do_begin() {