Adding / fixing AppDistrib

grumpycoders · Apr 24, 2024 · 94a5419 · 94a5419
1 parent f70bfe0
commit 94a5419
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -57,10 +57,12 @@ jobs:
         if: github.event_name == 'push'
         env:
           APPDISTRIB_TOKEN: ${{ secrets.APPDISTRIB_LINUX_X64 }}
+          APPDISTRIB_ORGANIZATION: pcsx-redux
+          APPDISTRIB_PROJECT: linux-x64
           APPCENTER_ACCESS_TOKEN: ${{ secrets.LINUX_APPCENTER_ACCESS_TOKEN }}
         run: |
           git config --global --add safe.directory /__w/pcsx-redux/pcsx-redux
           export BUILD=`git rev-parse HEAD | cut -c 1-8`
-          npx @appdistrib/cli -o pcsx-redux -p linux-x64 -m AppDir/usr/share/pcsx-redux/resources/version.json upload *.AppImage
           zip PCSX-Redux-$BUILD-linux-x86_64.zip *.AppImage
-          appcenter 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
+          npx appcenter distribute release -b $BUILD -f PCSX-Redux-$BUILD-linux-x86_64.zip -g public -a grumpycoders/pcsx-redux-linux64 --disable-telemetry
diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
@@ -24,7 +24,7 @@ jobs:
     - name: Build OpenBIOS
       run: make -C src/mips/openbios -j2
     - name: Upload results for MacOS build job
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: OpenBIOS
         path: src/mips/openbios/openbios.bin
@@ -33,7 +33,7 @@ jobs:
         make -C src/mips/openbios -j 2 clean
         make -C src/mips/tests -j 2 PCSX_TESTS=true
     - name: Upload results for MacOS build job
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: tests
         path: '**/*.ps-exe'
@@ -53,11 +53,11 @@ jobs:
     - name: Build PCSX-Redux
       run: make -j 2 all pcsx-redux-tests
     - name: Download OpenBIOS build
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: OpenBIOS
     - name: Download mips tests
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: tests
     - name: Bundle
@@ -99,18 +99,23 @@ jobs:
     - name: Creating Application link
       run: ln -s /Applications dmgdir
     - name: Creating dmg file
-      run: hdiutil create -volname PCSX-Redux-$BUILD -srcfolder dmgdir -ov -format UDZO PCSX-Redux-$BUILD.dmg
+      run: hdiutil create -volname PCSX-Redux-$BUILD -srcfolder dmgdir -ov -format UDZO PCSX-Redux-$BUILD-Intel.dmg
     - name: Applying icon to dmg file
       run: |
-        Rez -append icns.rsrc -o PCSX-Redux-$BUILD.dmg
-        SetFile -a C PCSX-Redux-$BUILD.dmg
+        Rez -append icns.rsrc -o PCSX-Redux-$BUILD-Intel.dmg
+        SetFile -a C PCSX-Redux-$BUILD-Intel.dmg
     - name: Removing temporary dmg folder
       run: rm -rf dmgdir
     - name: Upload DMG
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: Dmg
         path: '**/*.dmg'
+    - name: Upload version
+      uses: actions/upload-artifact@v4
+      with:
+        name: Version
+        path: PCSX-Redux.app/Contents/Resources/share/pcsx-redux/resources/version.json
 
   publish-app:
     runs-on: ubuntu-latest
@@ -125,15 +130,22 @@ jobs:
       uses: actions/setup-node@v4
       with:
         node-version: 'latest'
-    - name: Install appcenter
-      run: npm install -g appcenter-cli
     - name: Create BUILD environment
       run: echo "BUILD=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
     - name: Download DMG
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4
       with:
         name: Dmg
+    - name: Download version
+      uses: actions/download-artifact@v4
+      with:
+        name: Version
     - name: Distribute app
       env:
+        APPDISTRIB_TOKEN: ${{ secrets.APPDISTRIB_MACOS_X64 }}
+        APPDISTRIB_ORGANIZATION: pcsx-redux
+        APPDISTRIB_PROJECT: macos-x64
         APPCENTER_ACCESS_TOKEN: ${{ secrets.MACOS_APPCENTER_ACCESS_TOKEN }}
-      run: appcenter distribute release -n 0 -b $BUILD -f PCSX-Redux-$BUILD.dmg -g 'Public' -a grumpycoders/pcsx-redux-macos --disable-telemetry
+      run: |
+        npx @appdistrib/cli -m PCSX-Redux.app/Contents/Resources/share/pcsx-redux/resources/version.json upload PCSX-Redux-$BUILD-Intel.dmg
+        npx appcenter distribute release -n 0 -b $BUILD -f PCSX-Redux-$BUILD-Intel.dmg -g 'Public' -a grumpycoders/pcsx-redux-macos --disable-telemetry