From 7ba15e57f23a39b96c63765f2603bab90d7617c5 Mon Sep 17 00:00:00 2001
From: Gene Hoffman <30377676+hoffmang9@users.noreply.github.com>
Date: Wed, 17 Feb 2021 16:43:28 -0800
Subject: [PATCH] Don't pull main in the usual case (#937)

* Don't pull main in the usual case

* Use git to avoid setuptools_scm issues

* Double check submodule git status

* add js-yaml
---
 .github/workflows/build-macos-installer.yml   | 10 +++++-----
 .github/workflows/build-windows-installer.yml |  4 ++--
 chia-blockchain-gui                           |  2 +-
 install-gui.sh                                | 14 ++++++++------
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-macos-installer.yml b/.github/workflows/build-macos-installer.yml
index bc214f1737c6..8cdb050f3e90 100644
--- a/.github/workflows/build-macos-installer.yml
+++ b/.github/workflows/build-macos-installer.yml
@@ -85,11 +85,11 @@ jobs:
         p12-password: ${{ secrets.APPLE_DEV_ID_APP_PASS }}
 
     - name: Checkout GUI
-      uses: actions/checkout@v2
-      with:
-        repository: 'Chia-Network/chia-blockchain-gui'
-        ref: 'main'
-        path: './chia-blockchain-gui'
+      run: |
+        echo "Running git submodule update --init --recursive."
+        git submodule update --init --recursive
+        cd chia-blockchain-gui
+        git status
 
     - name: Run install script
       env:
diff --git a/.github/workflows/build-windows-installer.yml b/.github/workflows/build-windows-installer.yml
index 36f34a6852d0..45d2067e05a2 100644
--- a/.github/workflows/build-windows-installer.yml
+++ b/.github/workflows/build-windows-installer.yml
@@ -63,10 +63,10 @@ jobs:
 
     - name: Checkout GUI
       run: |
+        echo "Running git submodule update --init --recursive."
         git submodule update --init --recursive
         cd chia-blockchain-gui
-        git checkout main
-        git pull
+        git status
 
     - name: Test for secrets access
       id: check_secrets
diff --git a/chia-blockchain-gui b/chia-blockchain-gui
index 65fc9a871271..9025c226998f 160000
--- a/chia-blockchain-gui
+++ b/chia-blockchain-gui
@@ -1 +1 @@
-Subproject commit 65fc9a87127115ca0092e1090caf796693ab6eef
+Subproject commit 9025c226998f696ceb1307ce1ce399c5e2106180
diff --git a/install-gui.sh b/install-gui.sh
index 325a32741ec3..637cc18f148c 100644
--- a/install-gui.sh
+++ b/install-gui.sh
@@ -58,21 +58,23 @@ fi
 # for Mac and Windows so skip unless completing a source/developer install
 # Ubuntu special cases above
 if [ ! "$CI" ]; then
-	git submodule update --init --recursive
 	echo "Running git submodule update --init --recursive."
 	echo ""
-	cd chia-blockchain-gui
+	git submodule update --init --recursive
+	echo "Running git submodule update."
+	echo ""
 	git submodule update
+	cd chia-blockchain-gui
+
 	if [ "$SUBMODULE_BRANCH" ];
 	then
 		git checkout "$SUBMODULE_BRANCH"
+    git pull
 		echo ""
 		echo "Building the GUI with branch $SUBMODULE_BRANCH"
 		echo ""
-	else
-		git checkout main
-  fi
-  git pull
+	fi
+
 	npm install
 	npm audit fix
 	npm run locale:extract