Merge remote-tracking branch 'upstream/main' into fuckit

grumpycoders · Jun 9, 2024 · c25e5c3 · c25e5c3
2 parents d7ae274 + 9104229
commit c25e5c3
Show file tree

Hide file tree

Showing 31 changed files with 1,015 additions and 957 deletions.
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -74,5 +74,5 @@ jobs:
           git config --global --add safe.directory /__w/pcsx-redux/pcsx-redux
           export BUILD=`git rev-parse HEAD | cut -c 1-8`
           zip PCSX-Redux-$BUILD-linux-x86_64.zip *.AppImage
-          npx @appdistrib/cli -m AppDir/usr/share/pcsx-redux/resources/version.json upload PCSX-Redux-$BUILD-linux-x86_64.zip
           npx appcenter-cli distribute release -b $BUILD -f PCSX-Redux-$BUILD-linux-x86_64.zip -g public -a grumpycoders/pcsx-redux-linux64 --disable-telemetry
+          npx @appdistrib/cli -m AppDir/usr/share/pcsx-redux/resources/version.json upload PCSX-Redux-$BUILD-linux-x86_64.zip
diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
@@ -148,5 +148,5 @@ jobs:
         APPDISTRIB_PROJECT: dev-macos-x64
         APPCENTER_ACCESS_TOKEN: ${{ secrets.MACOS_APPCENTER_ACCESS_TOKEN }}
       run: |
-        npx @appdistrib/cli -m version.json upload PCSX-Redux-$BUILD-Intel.dmg
         npx appcenter-cli distribute release -n 0 -b $BUILD -f PCSX-Redux-$BUILD-Intel.dmg -g 'Public' -a grumpycoders/pcsx-redux-macos --disable-telemetry
+        npx @appdistrib/cli -m version.json upload PCSX-Redux-$BUILD-Intel.dmg