Merge branch 'dev' into arm-temp

GlitterWare · Mar 24, 2024 · 36bdf86 · 36bdf86
2 parents 9c24bc5 + 7b3e352
commit 36bdf86
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/.github/workflows/arm64.sh b/.github/workflows/arm64.sh
@@ -12,6 +12,9 @@ echo "===================================================="
 echo "Configure"
 echo "===================================================="
 
+mkdir /passy-build/cli
+mkdir /passy-build/Passy
+mkdir /passy-build/Passy-No-Updates-Popup
 export PATH="$PATH:$PWD/submodules/flutter/bin"
 git config --global --add safe.directory /Passy
 git config --global --add safe.directory /Passy/submodules/flutter
@@ -35,6 +38,7 @@ echo "Build Passy CLI"
 echo "===================================================="
 
 bash build_cli.sh
+cp -r /Passy/build/cli/latest/. /passy-build/cli
 
 echo "===================================================="
 echo "Build Passy"
@@ -43,14 +47,15 @@ echo "===================================================="
 flutter build linux
 rm /Passy/build/linux/arm64/release/bundle/lib/libargon2.so
 cp /Passy/build/cli/latest/lib/libargon2.so /Passy/build/linux/arm64/release/bundle/lib/
+cp -r /Passy/build/linux/arm64/release/bundle/. /passy-build/Passy
 
 echo "===================================================="
-echo "Prepare releases"
+echo "Build Passy No Updates Popup"
 echo "===================================================="
 
-cd /passy-build
-mkdir cli
-cp -r /Passy/build/cli/latest/. cli
-mkdir Passy
-cp -r /Passy/build/linux/arm64/release/bundle/. Passy
+flutter build linux --dart-define=UPDATES_POPUP_ENABLED=false
+rm /Passy/build/linux/arm64/release/bundle/lib/libargon2.so
+cp /Passy/build/cli/latest/lib/libargon2.so /Passy/build/linux/arm64/release/bundle/lib/
+cp -r /Passy/build/linux/arm64/release/bundle/. /passy-build/Passy-No-Updates-Popup
 
+echo "All Done!"
diff --git a/.github/workflows/build-linux-arm64-ci.yml b/.github/workflows/build-linux-arm64-ci.yml
@@ -48,6 +48,13 @@ jobs:
           directory: ../build
           filename: Passy-Linux-ARM64.zip
           path: Passy
+      - name: Archive Passy No Updates Popup build
+        uses: thedoctor0/zip-release@0.7.1
+        with:
+          type: zip
+          directory: ../build
+          filename: Passy-Linux-ARM64-No-Updates-Popup.zip
+          path: Passy-No-Updates-Popup
       - name: Upload Passy CLI build
         uses: actions/upload-artifact@v4
         with:
@@ -58,3 +65,8 @@ jobs:
         with:
           name: passy-linux-arm64
           path: /home/runner/work/Passy/build/Passy-Linux-ARM64.zip
+      - name: Upload Passy No Updates Popup build
+        uses: actions/upload-artifact@v4
+        with:
+          name: passy-linux-arm64-no-updates-popup
+          path: /home/runner/work/Passy/build/Passy-Linux-ARM64-No-Updates-Popup.zip