Merge branch 'jason/misc-install-ic-admin-mac' into 'master'

chore(release): Install ic-admin for Mac in the scripts for releases Tested that `cmd.sh install_binary ic-admin ${GIT_HASH} ${TOOLS_DIR}` works on my mac. See merge request dfinity-lab/public/ic!19988
dfinity · Jun 28, 2024 · 842953b · 842953b
2 parents 3b0dd1b + 6240c33
commit 842953b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 22 deletions.
diff --git a/testnet/tools/nns-tools/submit-mainnet-insert-upgrade-path-proposal.sh b/testnet/tools/nns-tools/submit-mainnet-insert-upgrade-path-proposal.sh
@@ -80,13 +80,7 @@ submit_insert_upgrade_path_proposal_mainnet() {
 if ! is_variable_set IC_ADMIN; then
     if [ ! -f "$MY_DOWNLOAD_DIR/ic-admin" ]; then
         PREVIOUS_VERSION=$(extract_previous_version "$PROPOSAL_FILE")
-
-        if [ $(uname -o) != "Darwin" ]; then
-            install_binary ic-admin "$PREVIOUS_VERSION" "$MY_DOWNLOAD_DIR"
-        else
-            echo "IC_ADMIN must be set for Mac, cannot download."
-            return 1
-        fi
+        install_binary ic-admin "$PREVIOUS_VERSION" "$MY_DOWNLOAD_DIR"
     fi
     IC_ADMIN=$MY_DOWNLOAD_DIR/ic-admin
 fi

diff --git a/testnet/tools/nns-tools/submit-mainnet-nns-upgrade-proposal.sh b/testnet/tools/nns-tools/submit-mainnet-nns-upgrade-proposal.sh
@@ -97,7 +97,6 @@ submit_nns_upgrade_proposal_mainnet() {
 if ! is_variable_set IC_ADMIN; then
     if [ ! -f "$MY_DOWNLOAD_DIR/ic-admin" ]; then
         PREVIOUS_VERSION=$(extract_previous_version "$PROPOSAL_FILE")
-
         install_binary ic-admin "$PREVIOUS_VERSION" "$MY_DOWNLOAD_DIR"
     fi
     IC_ADMIN=$MY_DOWNLOAD_DIR/ic-admin

diff --git a/testnet/tools/nns-tools/submit-mainnet-publish-sns-wasm-proposal.sh b/testnet/tools/nns-tools/submit-mainnet-publish-sns-wasm-proposal.sh
@@ -82,13 +82,7 @@ submit_nns_publish_sns_wasm_proposal_mainnet() {
 if ! is_variable_set IC_ADMIN; then
     if [ ! -f "$MY_DOWNLOAD_DIR/ic-admin" ]; then
         PREVIOUS_VERSION=$(extract_previous_version "$PROPOSAL_FILE")
-
-        if [ $(uname -o) != "Darwin" ]; then
-            install_binary ic-admin "$PREVIOUS_VERSION" "$MY_DOWNLOAD_DIR"
-        else
-            echo "IC_ADMIN must be set for Mac, cannot download."
-            return 1
-        fi
+        install_binary ic-admin "$PREVIOUS_VERSION" "$MY_DOWNLOAD_DIR"
     fi
     IC_ADMIN=$MY_DOWNLOAD_DIR/ic-admin
 fi

diff --git a/testnet/tools/nns-tools/submit-mainnet-sale-canister-upgrade-proposal.sh b/testnet/tools/nns-tools/submit-mainnet-sale-canister-upgrade-proposal.sh
@@ -71,13 +71,7 @@ submit_sale_upgrade_proposal_mainnet() {
 if ! is_variable_set IC_ADMIN; then
     if [ ! -f "$MY_DOWNLOAD_DIR/ic-admin" ]; then
         PREVIOUS_VERSION=$(extract_previous_version "$PROPOSAL_FILE")
-
-        if [ $(uname -o) != "Darwin" ]; then
-            install_binary ic-admin "$PREVIOUS_VERSION" "$MY_DOWNLOAD_DIR"
-        else
-            echo "IC_ADMIN must be set for Mac, cannot download."
-            exit 1
-        fi
+        install_binary ic-admin "$PREVIOUS_VERSION" "$MY_DOWNLOAD_DIR"
     fi
     IC_ADMIN=$MY_DOWNLOAD_DIR/ic-admin
 fi