build: not specify rust version

innobead · Dec 9, 2023 · 0f1926c · 0f1926c
1 parent 1fab8c9
commit 0f1926c
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 15 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,6 @@ version = "0.3.11"
 description = "Huber package, simplify `GitHub release` package management with a live awesome list of GitHub project"
 authors = ["David Ko <innobead@gmail.com>"]
 edition = "2021"
-rust-version = "1.68"
 keywords = ["github", "package-management", "cli", "package"]
 categories = ["command-line-interface", "command-line-utilities", "development-tools"]
 homepage = "https://github.com/innobead/huber"

diff --git a/Dockerfile.build b/Dockerfile.build
@@ -1,4 +1,4 @@
-FROM rust:1.68 as build
+FROM rust:latest as build
 WORKDIR /workspace
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM rust:1.68
+FROM rust:latest
 
 WORKDIR /workspace
 

diff --git a/crates/app/Cargo.toml b/crates/app/Cargo.toml
@@ -4,7 +4,6 @@ version.workspace = true
 description.workspace = true
 authors.workspace = true
 edition.workspace = true
-rust-version.workspace = true
 keywords.workspace = true
 categories.workspace = true
 homepage.workspace = true

diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml
@@ -4,7 +4,6 @@ version.workspace = true
 description = "Internal package used by Huber"
 authors.workspace = true
 edition.workspace = true
-rust-version.workspace = true
 keywords.workspace = true
 categories.workspace = true
 homepage.workspace = true

diff --git a/crates/generator/Cargo.toml b/crates/generator/Cargo.toml
@@ -4,7 +4,6 @@ version.workspace = true
 description = "Internal package used by Huber"
 authors.workspace = true
 edition.workspace = true
-rust-version.workspace = true
 keywords.workspace = true
 categories.workspace = true
 homepage.workspace = true

diff --git a/crates/procmacro/Cargo.toml b/crates/procmacro/Cargo.toml
@@ -4,7 +4,6 @@ version.workspace = true
 description = "Internal package used by Huber"
 authors.workspace = true
 edition.workspace = true
-rust-version.workspace = true
 keywords.workspace = true
 categories.workspace = true
 homepage.workspace = true

diff --git a/hack/setup-dev.sh b/hack/setup-dev.sh
@@ -5,8 +5,6 @@ set -o nounset
 set -o pipefail
 set -o xtrace
 
-RUST_VERSION=${RUST_VERSION:-1.65}
-
 function install_linux_dependencies() {
   if [[ $(command -v zypper) ]]; then
     # sudo zypper install -y -t pattern devel_basis
@@ -58,12 +56,12 @@ function install_macos_dependencies() {
     echo "export PKG_CONFIG_PATH=/usr/local/opt/libarchive/lib/pkgconfig"
   } >>"$HOME"/.bashrc
 
-  . "$HOME"/.bashrc
+  source "$HOME"/.bashrc
 }
 
 function install_rust_dependencies() {
-  if [[ -z $(command -v cargo 2>/dev/null) ]] || [[ -z $(cargo version | awk "/cargo $RUST_VERSION/" 2>/dev/null) ]]; then
-    curl https://sh.rustup.rs -sSf | sh -s -- -y
+  if [[ -z $(command -v cargo 2>/dev/null) ]]; then
+    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
     source "$HOME"/.cargo/env
     cargo version
   fi

diff --git a/hack/update-env.sh b/hack/update-env.sh
@@ -6,6 +6,10 @@ set -o pipefail
 set -o xtrace
 
 export_statement="export PATH=\$HOME/.huber/bin:\$PATH"
-if ! grep -Fxq "$export_statement"  ~/.bashrc; then
-  echo "$export_statement" >> ~/.bashrc
-fi
+
+shells=(bashrc zshrc)
+for s in "${shells[@]}"; do
+  if [ -f "$HOME"/."$s" ] && ! grep -Fxq "$export_statement" "$HOME"/."$s"; then
+    echo "$export_statement" >>"$HOME"/."$s"
+  fi
+done