Merge branch 'PCSX2:master' into master

PCSX2 · Jan 22, 2025 · 828ab10 · 828ab10
2 parents 7382b8b + d350408
commit 828ab10
Show file tree

Hide file tree

Showing 1,352 changed files with 238,250 additions and 137,583 deletions.
diff --git a/.github/workflows/cron_publish_flatpak.yml b/.github/workflows/cron_publish_flatpak.yml
@@ -43,7 +43,7 @@ jobs:
       compiler: clang
       cmakeflags: ""
       publish: true
-      branch: stable
       fetchTags: true
+      stableBuild: false
     secrets: inherit
 
diff --git a/.github/workflows/cron_update_base_translation.yml b/.github/workflows/cron_update_base_translation.yml
@@ -20,7 +20,7 @@ jobs:
         uses: peter-evans/create-pull-request@v7
         with:
           title: "Qt: Update Base Translation"
-          commit-message: "Qt: Update Base Translation"
+          commit-message: "[ci skip] Qt: Update Base Translation."
           committer: "PCSX2 Bot <[email protected]>"
           author: "PCSX2 Bot <[email protected]>"
           body: "Daily update of base translation sources."

diff --git a/.github/workflows/cron_update_controller_db.yml b/.github/workflows/cron_update_controller_db.yml
@@ -22,7 +22,7 @@ jobs:
         uses: peter-evans/create-pull-request@v7
         with:
           title: "PAD: Update to latest controller database"
-          commit-message: "PAD: Update to latest controller database."
+          commit-message: "[ci skip] PAD: Update to latest controller database."
           committer: "PCSX2 Bot <[email protected]>"
           author: "PCSX2 Bot <[email protected]>"
           body: "Weekly automatic update of SDL Controller DB."

diff --git a/.github/workflows/linux_build_flatpak.yml b/.github/workflows/linux_build_flatpak.yml
@@ -23,10 +23,6 @@ on:
       cmakeflags:
         required: true
         type: string
-      branch:
-        required: false
-        type: string
-        default: "stable"
       publish:
         required: false
         type: boolean
@@ -98,7 +94,8 @@ jobs:
         run: |
           flatpak-builder-lint manifest .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
 
-      - name: Build Flatpak
+      - name: Build Flatpak (beta)
+        if: ${{ inputs.stableBuild == false || inputs.stableBuild == 'false' }}
         uses: flathub-infra/flatpak-github-actions/flatpak-builder@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
         with:
           bundle: ${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak
@@ -108,26 +105,42 @@ jobs:
           build-bundle: true
           verbose: true
           mirror-screenshots-url: https://dl.flathub.org/media
-          branch: ${{ inputs.branch }}
+          branch: beta
           cache: true
           restore-cache: true
-          cache-key: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} flatpak ${{ hashFiles('.github/workflows/scripts/linux/flatpak/**/*.json') }}
+          cache-key: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} flatpak ${{ hashFiles('.github/workflows/scripts/linux/flatpak/**/*.json', '.github/workflows/scripts/common/*.patch') }}
 
+      - name: Build Flatpak (stable)
+        if: ${{ inputs.stableBuild == true || inputs.stableBuild == 'true' }}
+        uses: flathub-infra/flatpak-github-actions/flatpak-builder@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
+        with:
+          bundle: ${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak
+          upload-artifact: false
+          manifest-path: .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
+          arch: x86_64
+          build-bundle: true
+          verbose: true
+          mirror-screenshots-url: https://dl.flathub.org/media
+          branch: stable
+          cache: true
+          restore-cache: true
+          cache-key: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} flatpak ${{ hashFiles('.github/workflows/scripts/linux/flatpak/**/*.json') }}
+
       #- name: Validate build
       #  run: |
       #    flatpak-builder-lint repo repo
 
-      - name: Push to Flathub beta
-        if: inputs.publish == true && inputs.branch == 'beta'
+      - name: Push to Flathub (beta)
+        if: ${{ inputs.publish == true && (inputs.stableBuild == false || inputs.stableBuild == 'false') }}
         uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
         with:
           flat-manager-url: https://hub.flathub.org/
           repository: beta
           token: ${{ secrets.FLATHUB_BETA_TOKEN }}
           build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
-      - name: Push to Flathub stable
-        if: inputs.publish == true && inputs.branch == 'stable'
+      - name: Push to Flathub (stable)
+        if: ${{ inputs.publish == true && (inputs.stableBuild == true || inputs.stableBuild == 'true') }}
         uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
         with:
           flat-manager-url: https://hub.flathub.org/

diff --git a/.github/workflows/linux_build_qt.yml b/.github/workflows/linux_build_qt.yml
@@ -117,7 +117,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/deps
-          key: ${{ inputs.os }} ${{ inputs.platform }} deps ${{ hashFiles('.github/workflows/scripts/linux/build-dependencies-qt.sh') }}
+          key: ${{ inputs.os }} ${{ inputs.platform }} deps ${{ hashFiles('.github/workflows/scripts/linux/build-dependencies-qt.sh', '.github/workflows/scripts/common/*.patch') }}
 
       - name: Build Dependencies
         if: steps.cache-deps.outputs.cache-hit != 'true'

diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml
@@ -85,7 +85,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/deps
-          key: ${{ inputs.os }} deps ${{ hashFiles('.github/workflows/scripts/macos/build-dependencies.sh') }}
+          key: ${{ inputs.os }} deps ${{ hashFiles('.github/workflows/scripts/macos/build-dependencies.sh', '.github/workflows/scripts/common/*.patch') }}
 
       - name: Build Dependencies
         if: steps.cache-deps.outputs.cache-hit != 'true'

diff --git a/.github/workflows/release_cut_new.yml b/.github/workflows/release_cut_new.yml
@@ -114,7 +114,6 @@ jobs:
       artifactPrefixName: "PCSX2-linux-Qt-x64-flatpak"
       compiler: clang
       cmakeflags: ""
-      branch: "stable"
       publish: false
       fetchTags: true
       stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prelease == 'false' }}