From ec60fa9dc2bb1cdf78f008d780a488529c07978e Mon Sep 17 00:00:00 2001
From: Matthew Fosse <matt@fosse.co>
Date: Fri, 6 Sep 2024 08:45:13 -0700
Subject: [PATCH] update go version and mwebd hash
---
.github/workflows/pr_test_build_android.yml | 8 ++++----
.github/workflows/pr_test_build_linux.yml | 8 ++++----
scripts/android/build_mwebd.sh | 8 ++++----
scripts/ios/build_mwebd.sh | 4 ++--
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/pr_test_build_android.yml b/.github/workflows/pr_test_build_android.yml
index 80198155c..2253cc551 100644
--- a/.github/workflows/pr_test_build_android.yml
+++ b/.github/workflows/pr_test_build_android.yml
@@ -96,9 +96,9 @@ jobs:
- name: Install go and gomobile
run: |
- # install go > 1.21:
- wget https://go.dev/dl/go1.22.4.linux-amd64.tar.gz
- sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.22.4.linux-amd64.tar.gz
+ # install go > 1.23:
+ wget https://go.dev/dl/go1.23.1.linux-amd64.tar.gz
+ sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.23.1.linux-amd64.tar.gz
export PATH=$PATH:/usr/local/go/bin
export PATH=$PATH:~/go/bin
go install golang.org/x/mobile/cmd/gomobile@latest
@@ -113,7 +113,7 @@ jobs:
cd /opt/android/cake_wallet
git clone https://github.com/ltcmweb/mwebd
cd /opt/android/cake_wallet/mwebd
- git reset --hard 8dc343cf555e30ea909c5905bc8d6ac67b7fefcf
+ git reset --hard f6ea8a9e3d348b01bb44f03a1cc4ad65b0abe935
gomobile bind -target=android -androidapi 21 .
mkdir -p /opt/android/cake_wallet/cw_mweb/android/libs/
mv ./mwebd.aar $_
diff --git a/.github/workflows/pr_test_build_linux.yml b/.github/workflows/pr_test_build_linux.yml
index 5f4898f6b..50acdce94 100644
--- a/.github/workflows/pr_test_build_linux.yml
+++ b/.github/workflows/pr_test_build_linux.yml
@@ -91,9 +91,9 @@ jobs:
- name: Install go and gomobile
run: |
- # install go > 1.21:
- wget https://go.dev/dl/go1.22.4.linux-amd64.tar.gz
- sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.22.4.linux-amd64.tar.gz
+ # install go > 1.23:
+ wget https://go.dev/dl/go1.23.1.linux-amd64.tar.gz
+ sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.23.1.linux-amd64.tar.gz
export PATH=$PATH:/usr/local/go/bin
export PATH=$PATH:~/go/bin
go install golang.org/x/mobile/cmd/gomobile@latest
@@ -108,7 +108,7 @@ jobs:
cd /opt/android/cake_wallet
git clone https://github.com/ltcmweb/mwebd
cd /opt/android/cake_wallet/mwebd
- git reset --hard 7f31c84eeb2e954f2c5f385b39db3b8e3b6389e3
+ git reset --hard f6ea8a9e3d348b01bb44f03a1cc4ad65b0abe935
gomobile bind -target=android -androidapi 21 .
mkdir -p /opt/android/cake_wallet/cw_mweb/android/libs/
mv ./mwebd.aar $_
diff --git a/scripts/android/build_mwebd.sh b/scripts/android/build_mwebd.sh
index 269e58d8c..bbe436ff6 100755
--- a/scripts/android/build_mwebd.sh
+++ b/scripts/android/build_mwebd.sh
@@ -1,6 +1,6 @@
-# install go > 1.21:
-wget https://go.dev/dl/go1.22.4.linux-amd64.tar.gz
-sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.22.4.linux-amd64.tar.gz
+# install go > 1.23:
+wget https://go.dev/dl/go1.23.1.linux-amd64.tar.gz
+sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.23.1.linux-amd64.tar.gz
export PATH=$PATH:/usr/local/go/bin
export PATH=$PATH:~/go/bin
go install golang.org/x/mobile/cmd/gomobile@latest
@@ -8,7 +8,7 @@ gomobile init
# build mwebd:
git clone https://github.com/ltcmweb/mwebd
cd mwebd
-git reset --hard 7f31c84eeb2e954f2c5f385b39db3b8e3b6389e3
+git reset --hard f6ea8a9e3d348b01bb44f03a1cc4ad65b0abe935
gomobile bind -target=android -androidapi 21 .
mkdir -p ../../../cw_mweb/android/libs/
mv ./mwebd.aar $_
diff --git a/scripts/ios/build_mwebd.sh b/scripts/ios/build_mwebd.sh
index ae1726f23..ee1658800 100755
--- a/scripts/ios/build_mwebd.sh
+++ b/scripts/ios/build_mwebd.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# install go > 1.21:
+# install go > 1.23:
brew install go
export PATH=$PATH:~/go/bin
go install golang.org/x/mobile/cmd/gomobile@latest
@@ -7,7 +7,7 @@ gomobile init
# build mwebd:
git clone https://github.com/ltcmweb/mwebd
cd mwebd
-git reset --hard 7f31c84eeb2e954f2c5f385b39db3b8e3b6389e3
+git reset --hard f6ea8a9e3d348b01bb44f03a1cc4ad65b0abe935
gomobile bind -target=ios .
mv -fn ./Mwebd.xcframework ../../../ios/
# cleanup: