From 3756d46ad4e9bc3c3d7cf32b8a59daf2dcd8d2f4 Mon Sep 17 00:00:00 2001 From: cyan Date: Fri, 17 Oct 2025 19:01:31 +0200 Subject: [PATCH] chore: don't default to installing system files in scripts (#2592) --- .github/workflows/automated_integration_test.yml | 2 +- .github/workflows/pr_test_build_android.yml | 2 +- .github/workflows/pr_test_build_linux.yml | 4 ++-- docs/builds/ANDROID.md | 2 +- scripts/android/build_mwebd.sh | 6 +++--- scripts/ios/build_mwebd.sh | 4 +--- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/automated_integration_test.yml b/.github/workflows/automated_integration_test.yml index b95b71031..b64897c06 100644 --- a/.github/workflows/automated_integration_test.yml +++ b/.github/workflows/automated_integration_test.yml @@ -256,7 +256,7 @@ jobs: echo MWEBD_HASH=$MWEBD_HASH >> /etc/environment pushd scripts/android gomobile init; - ./build_mwebd.sh --dont-install + ./build_mwebd.sh popd - name: Build Decred diff --git a/.github/workflows/pr_test_build_android.yml b/.github/workflows/pr_test_build_android.yml index 2793c4b49..a49b4834f 100644 --- a/.github/workflows/pr_test_build_android.yml +++ b/.github/workflows/pr_test_build_android.yml @@ -245,7 +245,7 @@ jobs: export MWEBD_HASH=$(cat scripts/android/build_mwebd.sh | grep 'git reset --hard' | xargs | awk '{ print $4 }') echo MWEBD_HASH=$MWEBD_HASH >> /etc/environment pushd scripts/android - ./build_mwebd.sh --dont-install + ./build_mwebd.sh popd - name: Build Decred diff --git a/.github/workflows/pr_test_build_linux.yml b/.github/workflows/pr_test_build_linux.yml index e9f380926..2ae7f848a 100644 --- a/.github/workflows/pr_test_build_linux.yml +++ b/.github/workflows/pr_test_build_linux.yml @@ -209,7 +209,7 @@ jobs: run: | set -x -e pushd scripts - ./build_bitbox_flutter.sh --dont-install + ./build_bitbox_flutter.sh popd - name: Install Flutter dependencies @@ -222,7 +222,7 @@ jobs: export MWEBD_HASH=$(cat scripts/android/build_mwebd.sh | grep 'git reset --hard' | xargs | awk '{ print $4 }') echo MWEBD_HASH=$MWEBD_HASH >> /etc/environment pushd scripts/android - ./build_mwebd.sh --dont-install + ./build_mwebd.sh popd - name: Build generated code diff --git a/docs/builds/ANDROID.md b/docs/builds/ANDROID.md index d8e4bd3d9..d598c07ef 100644 --- a/docs/builds/ANDROID.md +++ b/docs/builds/ANDROID.md @@ -28,7 +28,7 @@ pushd scripts/android ./app_config.sh ./build_monero_all.sh ./build_decred.sh - ./build_mwebd.sh --dont-install + ./build_mwebd.sh popd pushd android/app [[ -f key.jks ]] || keytool -genkey -v -keystore key.jks -keyalg RSA -keysize 2048 -validity 10000 -alias testKey -noprompt -dname "CN=CakeWallet, OU=CakeWallet, O=CakeWallet, L=Florida, S=America, C=USA" -storepass hunter1 -keypass hunter1 diff --git a/scripts/android/build_mwebd.sh b/scripts/android/build_mwebd.sh index d56123afc..08782ac1f 100755 --- a/scripts/android/build_mwebd.sh +++ b/scripts/android/build_mwebd.sh @@ -1,6 +1,6 @@ -if [[ "$1" == "--dont-install" ]]; then - echo "Skipping Go installation as per --dont-install flag" -else +#!/bin/bash + +if [[ "$1" == "--install" ]]; then # install go > 1.24: wget https://go.dev/dl/go1.24.1.linux-amd64.tar.gz sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.24.1.linux-amd64.tar.gz diff --git a/scripts/ios/build_mwebd.sh b/scripts/ios/build_mwebd.sh index 55401cc34..d14910dd2 100755 --- a/scripts/ios/build_mwebd.sh +++ b/scripts/ios/build_mwebd.sh @@ -2,9 +2,7 @@ set -e -x -if [[ "$1" == "--dont-install" ]]; then - echo "Skipping Go installation as per --dont-install flag" -else +if [[ "$1" == "--install" ]]; then # install go > 1.24: brew install go export PATH=$PATH:~/go/bin