Merge branch 'main' into more_lua_stuffs

grumpycoders · Nov 22, 2024 · ec31c2c · ec31c2c
2 parents 8b77052 + 1587118
commit ec31c2c
Show file tree

Hide file tree

Showing 448 changed files with 19,982 additions and 14,148 deletions.
diff --git a/.github/workflows/linux-aur.yml b/.github/workflows/linux-aur.yml
@@ -0,0 +1,27 @@
+name: Linux CI AUR
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  aur-build:
+    runs-on: ubuntu-latest
+    container:
+      image: archlinux:latest
+    steps:
+      - name: Install dependencies
+        run: | 
+          pacman -Syu --noconfirm --needed capstone curl ffmpeg freetype2 glfw libuv sdl2 zlib git make pkg-config sudo base-devel pacman-contrib
+      - name: Create builduser
+        run: |
+          useradd builduser -m
+          passwd -d builduser
+      - name: Build AUR Package
+        run: |
+          git clone https://aur.archlinux.org/pcsx-redux-git.git
+          chown -R builduser:builduser pcsx-redux-git
+          cd pcsx-redux-git
+          sudo -u builduser makepkg
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -22,27 +22,42 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - run: |
-          make -j 2 all pcsx-redux-tests
+          make -j 2 all pcsx-redux-tests tools
           make -C src/mips/tests -j 2 PCSX_TESTS=true
           make -C src/mips/openbios -j 2 clean all
+      - name: Install node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22.6.0'
+      - name: Install jq
+        run: |
+          apt install -y jq
       - name: Packaging
+        env:
+          APPDISTRIB_TOKEN: ${{ secrets.APPDISTRIB_DEV_LINUX_X64 }}
+          APPDISTRIB_ORGANIZATION: pcsx-redux
+          APPDISTRIB_PROJECT: dev-linux-x64
         run: |
+          npx @appdistrib/cli buildid > buildid.json
           git config --global --add safe.directory /__w/pcsx-redux/pcsx-redux
           make install install-openbios DESTDIR=AppDir/usr
-          echo '{' > AppDir/usr/share/pcsx-redux/resources/version.json
-          echo '  "version": "'`git rev-parse HEAD | cut -c 1-8`'",' >> AppDir/usr/share/pcsx-redux/resources/version.json
-          echo '  "changeset": "'`git rev-parse HEAD`'",' >> AppDir/usr/share/pcsx-redux/resources/version.json
-          echo '  "timestamp": '`date '+%s'`',' >> AppDir/usr/share/pcsx-redux/resources/version.json
-          echo '  "channel": "dev",' >> AppDir/usr/share/pcsx-redux/resources/version.json
-          echo '  "updateInfo": [' >> AppDir/usr/share/pcsx-redux/resources/version.json
-          echo '    {' >> AppDir/usr/share/pcsx-redux/resources/version.json
-          echo '      "channel": "dev",' >> AppDir/usr/share/pcsx-redux/resources/version.json
-          echo '      "method": "appcenter",' >> AppDir/usr/share/pcsx-redux/resources/version.json
-          echo '      "updateCatalog": "https://install.appcenter.ms/api/v0.1/apps/grumpycoders/pcsx-redux-linux64/distribution_groups/public/public_releases",' >> AppDir/usr/share/pcsx-redux/resources/version.json
-          echo '      "updateInfoBase": "https://install.appcenter.ms/api/v0.1/apps/grumpycoders/pcsx-redux-linux64/distribution_groups/public/releases/"' >> AppDir/usr/share/pcsx-redux/resources/version.json
-          echo '    }' >> AppDir/usr/share/pcsx-redux/resources/version.json
-          echo '  ]' >> AppDir/usr/share/pcsx-redux/resources/version.json
-          echo '}' >> AppDir/usr/share/pcsx-redux/resources/version.json
+          echo '{' > version.json
+          echo '  "version": "'`git rev-parse HEAD | cut -c 1-8`'",' >> version.json
+          echo '  "buildId": '`jq -r .buildid buildid.json`',' >> version.json
+          echo '  "changeset": "'`git rev-parse HEAD`'",' >> version.json
+          echo '  "timestamp": '`date '+%s'`',' >> version.json
+          echo '  "channel": "dev",' >> version.json
+          echo '  "updateInfo": [' >> version.json
+          echo '    {' >> version.json
+          echo '      "channel": "dev",' >> version.json
+          echo '      "method": "appdistrib",' >> version.json
+          echo '      "updateCatalog": "https://distrib.app/storage/manifests/pcsx-redux/dev-linux-x64/manifest.json",' >> version.json
+          echo '      "updateInfoBase": "https://distrib.app/storage/manifests/pcsx-redux/dev-linux-x64/",' >> version.json
+          echo '      "updateStorageUrl": "https://distrib.app/"' >> version.json
+          echo '    }' >> version.json
+          echo '  ]' >> version.json
+          echo '}' >> version.json
+          cp version.json AppDir/usr/share/pcsx-redux/resources
           appimage-builder --skip-tests
       - name: Test
         run: |
@@ -52,10 +67,13 @@ jobs:
       - name: Deploy
         if: github.event_name == 'push'
         env:
+          APPDISTRIB_TOKEN: ${{ secrets.APPDISTRIB_DEV_LINUX_X64 }}
+          APPDISTRIB_ORGANIZATION: pcsx-redux
+          APPDISTRIB_PROJECT: dev-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`
-          . /usr/local/nvm/nvm.sh
           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 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 -l buildId -m version.json upload PCSX-Redux-$BUILD-linux-x86_64.zip
diff --git a/.github/workflows/linux-coverage.yml b/.github/workflows/linux-coverage.yml
@@ -14,6 +14,7 @@ jobs:
       env:
         TEST_RESULTS: /tmp/test-results
         BUILD: Coverage
+        CPPFLAGS: -Werror=format-security
     steps:
       - name: Update lcov, because https://bugs.launchpad.net/ubuntu/+source/lcov/+bug/2029924
         run: |