Fix skytemple-rust installation macOS/Windows

SkyTemple · Sep 17, 2023 · 8dbebf2 · 8dbebf2
1 parent e998049
commit 8dbebf2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml
@@ -158,12 +158,15 @@ jobs:
           # Package
           .\build-windows.ps1 $PACKAGE_VERSION
 
+          
           if(!(Test-Path ".\dist\skytemple\skytemple.exe")){
               return 1
           }
           
           # Install latest skytemple-rust
-          bash .\install-skytemple-rust.sh
+          if ($env:IS_DEV_BUILD) {
+              bash .\install-skytemple-rust.sh
+          }
       - name: Create installer
         uses: joncloud/[email protected]
         with:
@@ -201,7 +204,9 @@ jobs:
 
           # Install other dependencies and SkyTemple itself
           pip3 install py-desmume pyinstaller
-          IS_MACOS=1 installer/install-skytemple-rust.sh x86_64
+          if [ -n "$IS_DEV_BUILD" ]; then
+            IS_MACOS=1 installer/install-skytemple-rust.sh x86_64
+          fi
           pip3 install -r requirements-mac-windows.txt
           pip3 install '.[eventserver]'
           if [ -n "$IS_DEV_BUILD" ]; then

diff --git a/installer/install-skytemple-rust.sh b/installer/install-skytemple-rust.sh
@@ -10,10 +10,7 @@ platform="windows-2019"
 arch="x64"
 py_version="3.11"
 
-branch="release"
-if [ -n "$IS_DEV_BUILD" ]; then
-  branch="master"
-fi
+branch="master"
 
 if [ -n "$IS_MACOS" ]; then
   platform="macos-11"