diff --git a/.github/workflows/release-push-tag-and-draft.yml b/.github/workflows/release_new_tag.yml similarity index 85% rename from .github/workflows/release-push-tag-and-draft.yml rename to .github/workflows/release_new_tag.yml index ae251e3330..14535e6e05 100644 --- a/.github/workflows/release-push-tag-and-draft.yml +++ b/.github/workflows/release_new_tag.yml @@ -22,26 +22,28 @@ on: # required: true jobs: - cut-release: + tag-master: if: github.repository == 'PCSX2/pcsx2' runs-on: ubuntu-latest + name: "Create Tag and Release" steps: - uses: actions/checkout@v3 # Docs - https://github.com/mathieudutour/github-tag-action - # Workflows cannot trigger other workflows implicitly - # - https://github.community/t/github-actions-workflow-not-triggering-with-tag-push/17053/7 - name: Bump Version and Push Tag id: tag_version uses: mathieudutour/github-tag-action@v6.0 with: + # Workflows cannot trigger other workflows implicitly + # - https://github.community/t/github-actions-workflow-not-triggering-with-tag-push/17053/7 github_token: ${{ secrets.BOT_PAT }} tag_prefix: v default_bump: patch - # Generate the Release Notes - name: Generate Release Notes env: + OWNER: PCSX2 + REPO: pcsx2 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} COMMIT_SHA: ${{ github.SHA }} run: | @@ -49,9 +51,7 @@ jobs: npm ci node index.js mv ./release-notes.md ${GITHUB_WORKSPACE}/release-notes.md - ls - # Docs - https://github.com/softprops/action-gh-release - name: Create a GitHub Release uses: softprops/action-gh-release@v1 if: steps.tag_version.outputs.new_tag diff --git a/.github/workflows/release_pipeline.yml b/.github/workflows/release_pipeline.yml new file mode 100644 index 0000000000..acc11709ca --- /dev/null +++ b/.github/workflows/release_pipeline.yml @@ -0,0 +1,124 @@ +name: 🏭 Release Pipeline + +on: + push: + tags: + - v* + +jobs: + # Build Everything + # Linux + build_gcc_lto: + if: github.repository == 'PCSX2/pcsx2' + name: "Linux - AppImage" + uses: ./.github/workflows/linux_build.yml + with: + jobName: "wxWidgets" + compiler: gcc + cmakeflags: "-DLTO_PCSX2_CORE=ON" + buildAppImage: true + secrets: inherit + + # Windows + build_wx_sse4: + if: github.repository == 'PCSX2/pcsx2' + name: "Windows - SSE4" + uses: ./.github/workflows/windows_build_wx.yml + with: + jobName: wxWidgets + configuration: Release + simd: "SSE4" + secrets: inherit + + build_wx_avx2: + if: github.repository == 'PCSX2/pcsx2' + name: "Windows - AVX2" + uses: ./.github/workflows/windows_build_wx.yml + with: + jobName: wxWidgets + configuration: Release AVX2 + secrets: inherit + + build_qt_sse4: + if: github.repository == 'PCSX2/pcsx2' + name: "Windows - SSE4" + uses: ./.github/workflows/windows_build_qt.yml + with: + jobName: Qt + configuration: Release + simd: "SSE4" + secrets: inherit + + build_qt_avx2: + if: github.repository == 'PCSX2/pcsx2' + name: "Windows - AVX2" + uses: ./.github/workflows/windows_build_qt.yml + with: + jobName: Qt + configuration: Release AVX2 + secrets: inherit + + # MacOS + build_macos_default: + if: github.repository == 'PCSX2/pcsx2' + name: "MacOS - Defaults" + uses: ./.github/workflows/macos_build.yml + with: + jobName: "wxWidgets" + secrets: inherit + + # Upload the Artifacts + upload_artifacts: + if: github.repository == 'PCSX2/pcsx2' + needs: + - build_gcc_lto + - build_wx_sse4 + - build_wx_avx2 + - build_qt_sse4 + - build_qt_avx2 + - build_macos_default + name: "Upload Artifacts" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Prepare Artifact Folder + run: mkdir ./ci-artifacts/ + + - uses: actions/download-artifact@v3 + name: Download all Artifacts + with: + path: ./ci-artifacts/ + + - name: Display structure of downloaded files + run: ls ./ci-artifacts/ + + # Prepare artifacts, they are all zips from github! + - name: Prepare Artifacts + working-directory: ./ci-artifacts/ + run: for d in *windows*/; do 7z a "${d}asset.7z" $d; done + + # Artifact Naming: + # MacOS: PCSX2--macOS-[additional hyphen seperated tags] + # Windows|Linux: PCSX2---<32bit|64bit>--[additional hyphen seperated tags] + - name: Name and Upload the Release Assets + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TAG: ${{ github.REF }} + SCAN_DIR: ${{ github.WORKSPACE }}/ci-artifacts + OUT_DIR: ${{ github.WORKSPACE }}/ci-artifacts/out + run: | + gh release list --repo PCSX2/pcsx2 + mkdir -p ${{ github.WORKSPACE }}/ci-artifacts/out + python ./.github/workflows/scripts/releases/rename-release-assets.py + ls ${{ github.WORKSPACE }}/ci-artifacts/out + TAG_VAL=$(echo ${{ github.REF }} | awk -F'refs/tags/' '{print $2}') + gh release upload "${TAG_VAL}" ${{ github.WORKSPACE }}/ci-artifacts/out/* --repo PCSX2/pcsx2 --clobber + + - name: Publish Release + env: + GITHUB_TOKEN: ${{ secrets.BOT_PAT }} + run: | + TAG_VAL=$(echo ${{ github.REF }} | awk -F'refs/tags/' '{print $2}') + gh release edit ${TAG_VAL} --draft=false --repo PCSX2/pcsx2 + diff --git a/.github/workflows/scripts/common/name-artifacts.sh b/.github/workflows/scripts/common/name-artifacts.sh old mode 100644 new mode 100755 diff --git a/.github/workflows/scripts/releases/rename-release-assets.py b/.github/workflows/scripts/releases/rename-release-assets.py new file mode 100644 index 0000000000..a1d345b7fc --- /dev/null +++ b/.github/workflows/scripts/releases/rename-release-assets.py @@ -0,0 +1,48 @@ +import os +import shutil + +tag = os.environ['TAG'].split("refs/tags/")[1] +scan_dir = os.environ['SCAN_DIR'] +output_dir = os.environ['OUT_DIR'] +accepted_exts = ["AppImage", "tar.gz", "7z"] + + +for dir in os.listdir(scan_dir): + asset_name = "pcsx2-{}".format(tag) + if "macos" in dir.lower(): + asset_name += "-macos" + elif "linux" in dir.lower(): + asset_name += "-linux-AppImage-64bit" + elif "windows" in dir.lower(): + asset_name += "-windows-64bit" + if "avx" in dir.lower(): + asset_name += "-AVX2" + else: + asset_name += "-SSE4" + else: + continue; + + if "wxwidgets" in dir.lower(): + asset_name += "-wxWidgets" + else: + asset_name += "-Qt" + + if "symbols" in dir.lower(): + asset_name += "-symbols" + + print(asset_name) + + dir_handled = False + for file in os.listdir(os.path.join(scan_dir, dir)): + for ext in accepted_exts: + if file.endswith(ext): + dir_handled = True + print("Moving {} to out dir".format(file)) + shutil.move(os.path.join(scan_dir, dir, file), os.path.join(output_dir, asset_name + "." + ext)) + break + if dir_handled: + break + + if not dir_handled: + print("Could not find asset in directory when one was expected") + exit(1) diff --git a/.github/workflows/scripts/releases/upload-release-artifacts/.gitignore b/.github/workflows/scripts/releases/upload-release-artifacts/.gitignore deleted file mode 100644 index d77ae12d06..0000000000 --- a/.github/workflows/scripts/releases/upload-release-artifacts/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -node_modules/ -*.md diff --git a/.github/workflows/scripts/releases/upload-release-artifacts/index.js b/.github/workflows/scripts/releases/upload-release-artifacts/index.js deleted file mode 100644 index 9d301d46e7..0000000000 --- a/.github/workflows/scripts/releases/upload-release-artifacts/index.js +++ /dev/null @@ -1,143 +0,0 @@ -import { Octokit } from "@octokit/rest"; -import { throttling } from "@octokit/plugin-throttling"; -import { retry } from "@octokit/plugin-retry"; -Octokit.plugin(throttling); -Octokit.plugin(retry); -const octokit = new Octokit({ - auth: process.env.GITHUB_TOKEN, - userAgent: 'PCSX2/pcsx2', - log: { - debug: () => { }, - info: () => { }, - warn: console.warn, - error: console.error - }, - throttle: { - onRateLimit: (retryAfter, options) => { - octokit.log.warn( - `Request quota exhausted for request ${options.method} ${options.url}` - ); - - // Retry twice after hitting a rate limit error, then give up - if (options.request.retryCount <= 2) { - console.log(`Retrying after ${retryAfter} seconds!`); - return true; - } - }, - onAbuseLimit: (retryAfter, options) => { - // does not retry, only logs a warning - octokit.log.warn( - `Abuse detected for request ${options.method} ${options.url}` - ); - }, - } -}); - -let assetDir = process.env.ASSET_DIR; -let tagToSearchFor = process.env.TAG_TO_SEARCH_FOR.split("refs/tags/")[1]; - -console.log(`Searching in - ${assetDir}`); -console.log(`Searching for tag - ${tagToSearchFor}`); - -const { data: recentReleases } = await octokit.rest.repos.listReleases({ - owner: "PCSX2", - repo: "pcsx2", - per_page: 100 -}); - -let release = undefined; -for (var i = 0; i < recentReleases.length; i++) { - if (recentReleases[i].tag_name == tagToSearchFor) { - release = recentReleases[i]; - break; - } -} - -if (release == undefined) { - console.log(`Unable to find release with tag - ${tagToSearchFor}`); - process.exit(1); -} - -// Upload any assets we need to, don't upload assets that are already there! -const { data: releaseAssetsPre } = await octokit.rest.repos.listReleaseAssets({ - owner: "PCSX2", - repo: "pcsx2", - release_id: release.id, - per_page: 100 -}); - -import glob from 'glob'; -import * as fs from 'fs'; -import * as path from 'path'; -glob(assetDir + `/**/*${process.env.ASSET_EXTENSION}`, {}, async (err, files) => { - for (var i = 0; i < files.length; i++) { - let foundDuplicate = false; - for (var j = 0; j < releaseAssetsPre.length; j++) { - let existingAsset = releaseAssetsPre[j]; - if (existingAsset.name == `pcsx2-${release.tag_name}-${path.basename(files[i])}`) { - foundDuplicate = true; - break; - } - } - if (foundDuplicate) { - continue; - } - - var assetBytes = fs.readFileSync(files[i], null); - const { data: uploadAsset } = await octokit.rest.repos.uploadReleaseAsset({ - owner: "PCSX2", - repo: "pcsx2", - release_id: release.id, - name: `pcsx2-${release.tag_name}-${path.basename(files[i])}`, - data: assetBytes, - }); - } -}); - -// Ideally there would be a webhook event for when an artifact is added to a draft release -// unfortunately, such a thing does not exist yet. Therefore, we have to wait a bit -// for the API to become consistent -// TODO - future work - we could check previous draft releases to become eventually consistent as well -// - draft releases should only be a temporary state, so anything that remains a draft had a problem -await new Promise(resolve => setTimeout(resolve, 10 * 1000)); - -// Poll the release, and check to see if it's ready to be published -const { data: releaseAssetsPost } = await octokit.rest.repos.listReleaseAssets({ - owner: "PCSX2", - repo: "pcsx2", - release_id: release.id, - per_page: 100 -}); - -// Expected Assets, if we have all of them, we will publish it -let expectedAssets = { - "windows-64bit-sse4": false, - "windows-64bit-avx2": false, - "linux-appimage-64bit": false, - "macos": false, -} - -for (var i = 0; i < releaseAssetsPost.length; i++) { - let asset = releaseAssetsPost[i]; - if (asset.name.includes("symbols")) { - continue; - } - for (var j = 0; j < Object.keys(expectedAssets).length; j++) { - let expectedNamePrefix = Object.keys(expectedAssets)[j]; - if (asset.name.toLowerCase().includes(expectedNamePrefix)) { - expectedAssets[expectedNamePrefix] = true; - break; - } - } -} - -console.log(expectedAssets); - -if (Object.values(expectedAssets).every(Boolean)) { - await octokit.rest.repos.updateRelease({ - owner: "PCSX2", - repo: "pcsx2", - release_id: release.id, - draft: false - }); -} diff --git a/.github/workflows/scripts/releases/upload-release-artifacts/package-lock.json b/.github/workflows/scripts/releases/upload-release-artifacts/package-lock.json deleted file mode 100644 index b06e5b00c2..0000000000 --- a/.github/workflows/scripts/releases/upload-release-artifacts/package-lock.json +++ /dev/null @@ -1,559 +0,0 @@ -{ - "name": "upload-release-artifacts", - "version": "1.0.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "version": "1.0.0", - "license": "ISC", - "dependencies": { - "@octokit/plugin-retry": "^3.0.9", - "@octokit/plugin-throttling": "^3.5.2", - "@octokit/rest": "^18.12.0", - "glob": "^7.2.0" - } - }, - "node_modules/@octokit/auth-token": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz", - "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==", - "dependencies": { - "@octokit/types": "^6.0.3" - } - }, - "node_modules/@octokit/core": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.5.1.tgz", - "integrity": "sha512-omncwpLVxMP+GLpLPgeGJBF6IWJFjXDS5flY5VbppePYX9XehevbDykRH9PdCdvqt9TS5AOTiDide7h0qrkHjw==", - "dependencies": { - "@octokit/auth-token": "^2.4.4", - "@octokit/graphql": "^4.5.8", - "@octokit/request": "^5.6.0", - "@octokit/request-error": "^2.0.5", - "@octokit/types": "^6.0.3", - "before-after-hook": "^2.2.0", - "universal-user-agent": "^6.0.0" - } - }, - "node_modules/@octokit/endpoint": { - "version": "6.0.12", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz", - "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==", - "dependencies": { - "@octokit/types": "^6.0.3", - "is-plain-object": "^5.0.0", - "universal-user-agent": "^6.0.0" - } - }, - "node_modules/@octokit/graphql": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz", - "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==", - "dependencies": { - "@octokit/request": "^5.6.0", - "@octokit/types": "^6.0.3", - "universal-user-agent": "^6.0.0" - } - }, - "node_modules/@octokit/openapi-types": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.1.0.tgz", - "integrity": "sha512-dWZfYvCCdjZzDYA3lIAMF72Q0jld8xidqCq5Ryw09eBJXZdcM6he0vWBTvw/b5UnGYqexxOyHWgfrsTlUJL3Gw==" - }, - "node_modules/@octokit/plugin-paginate-rest": { - "version": "2.16.9", - "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.16.9.tgz", - "integrity": "sha512-gfSCMgz5scFKsR0dW4jaYsDJVt/UwCHp4dF7sHlmSekZvwzvLiOAGZ4MQkEsL5DW9hIk2W+UQkYZMTA1b6Wsqw==", - "dependencies": { - "@octokit/types": "^6.33.0" - } - }, - "node_modules/@octokit/plugin-request-log": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz", - "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==" - }, - "node_modules/@octokit/plugin-rest-endpoint-methods": { - "version": "5.12.1", - "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.12.1.tgz", - "integrity": "sha512-0nY3htfl6x9UkPcqv8pm9vOC/bTA7f4IMDWln13neHRdNWQvOQgZ9fRxK7BAc74rye4yVINEFi9Yb9rnGUvosA==", - "dependencies": { - "@octokit/types": "^6.33.0", - "deprecation": "^2.3.1" - } - }, - "node_modules/@octokit/plugin-retry": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@octokit/plugin-retry/-/plugin-retry-3.0.9.tgz", - "integrity": "sha512-r+fArdP5+TG6l1Rv/C9hVoty6tldw6cE2pRHNGmFPdyfrc696R6JjrQ3d7HdVqGwuzfyrcaLAKD7K8TX8aehUQ==", - "dependencies": { - "@octokit/types": "^6.0.3", - "bottleneck": "^2.15.3" - } - }, - "node_modules/@octokit/plugin-throttling": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-3.5.2.tgz", - "integrity": "sha512-Eu7kfJxU8vmHqWGNszWpg+GVp2tnAfax3XQV5CkYPEE69C+KvInJXW9WajgSeW+cxYe0UVdouzCtcreGNuJo7A==", - "dependencies": { - "@octokit/types": "^6.0.1", - "bottleneck": "^2.15.3" - } - }, - "node_modules/@octokit/request": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.2.tgz", - "integrity": "sha512-je66CvSEVf0jCpRISxkUcCa0UkxmFs6eGDRSbfJtAVwbLH5ceqF+YEyC8lj8ystKyZTy8adWr0qmkY52EfOeLA==", - "dependencies": { - "@octokit/endpoint": "^6.0.1", - "@octokit/request-error": "^2.1.0", - "@octokit/types": "^6.16.1", - "is-plain-object": "^5.0.0", - "node-fetch": "^2.6.1", - "universal-user-agent": "^6.0.0" - } - }, - "node_modules/@octokit/request-error": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz", - "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==", - "dependencies": { - "@octokit/types": "^6.0.3", - "deprecation": "^2.0.0", - "once": "^1.4.0" - } - }, - "node_modules/@octokit/rest": { - "version": "18.12.0", - "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz", - "integrity": "sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==", - "dependencies": { - "@octokit/core": "^3.5.1", - "@octokit/plugin-paginate-rest": "^2.16.8", - "@octokit/plugin-request-log": "^1.0.4", - "@octokit/plugin-rest-endpoint-methods": "^5.12.0" - } - }, - "node_modules/@octokit/types": { - "version": "6.33.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.33.0.tgz", - "integrity": "sha512-0zffZ048M0UhthyPXQHLz4038Ak46nMWZXkzlXvXB/M/L1jYPBceq4iZj4qjKVrvveaJrrgKdJ9+3yUuITfcCw==", - "dependencies": { - "@octokit/openapi-types": "^11.1.0" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "node_modules/before-after-hook": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz", - "integrity": "sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==" - }, - "node_modules/bottleneck": { - "version": "2.19.5", - "resolved": "https://registry.npmjs.org/bottleneck/-/bottleneck-2.19.5.tgz", - "integrity": "sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw==" - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "node_modules/deprecation": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz", - "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==" - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, - "node_modules/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/is-plain-object": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" - }, - "node_modules/universal-user-agent": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz", - "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==" - }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" - } - }, - "dependencies": { - "@octokit/auth-token": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz", - "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==", - "requires": { - "@octokit/types": "^6.0.3" - } - }, - "@octokit/core": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.5.1.tgz", - "integrity": "sha512-omncwpLVxMP+GLpLPgeGJBF6IWJFjXDS5flY5VbppePYX9XehevbDykRH9PdCdvqt9TS5AOTiDide7h0qrkHjw==", - "requires": { - "@octokit/auth-token": "^2.4.4", - "@octokit/graphql": "^4.5.8", - "@octokit/request": "^5.6.0", - "@octokit/request-error": "^2.0.5", - "@octokit/types": "^6.0.3", - "before-after-hook": "^2.2.0", - "universal-user-agent": "^6.0.0" - } - }, - "@octokit/endpoint": { - "version": "6.0.12", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz", - "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==", - "requires": { - "@octokit/types": "^6.0.3", - "is-plain-object": "^5.0.0", - "universal-user-agent": "^6.0.0" - } - }, - "@octokit/graphql": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz", - "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==", - "requires": { - "@octokit/request": "^5.6.0", - "@octokit/types": "^6.0.3", - "universal-user-agent": "^6.0.0" - } - }, - "@octokit/openapi-types": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.1.0.tgz", - "integrity": "sha512-dWZfYvCCdjZzDYA3lIAMF72Q0jld8xidqCq5Ryw09eBJXZdcM6he0vWBTvw/b5UnGYqexxOyHWgfrsTlUJL3Gw==" - }, - "@octokit/plugin-paginate-rest": { - "version": "2.16.9", - "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.16.9.tgz", - "integrity": "sha512-gfSCMgz5scFKsR0dW4jaYsDJVt/UwCHp4dF7sHlmSekZvwzvLiOAGZ4MQkEsL5DW9hIk2W+UQkYZMTA1b6Wsqw==", - "requires": { - "@octokit/types": "^6.33.0" - } - }, - "@octokit/plugin-request-log": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz", - "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==" - }, - "@octokit/plugin-rest-endpoint-methods": { - "version": "5.12.1", - "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.12.1.tgz", - "integrity": "sha512-0nY3htfl6x9UkPcqv8pm9vOC/bTA7f4IMDWln13neHRdNWQvOQgZ9fRxK7BAc74rye4yVINEFi9Yb9rnGUvosA==", - "requires": { - "@octokit/types": "^6.33.0", - "deprecation": "^2.3.1" - } - }, - "@octokit/plugin-retry": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@octokit/plugin-retry/-/plugin-retry-3.0.9.tgz", - "integrity": "sha512-r+fArdP5+TG6l1Rv/C9hVoty6tldw6cE2pRHNGmFPdyfrc696R6JjrQ3d7HdVqGwuzfyrcaLAKD7K8TX8aehUQ==", - "requires": { - "@octokit/types": "^6.0.3", - "bottleneck": "^2.15.3" - } - }, - "@octokit/plugin-throttling": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-3.5.2.tgz", - "integrity": "sha512-Eu7kfJxU8vmHqWGNszWpg+GVp2tnAfax3XQV5CkYPEE69C+KvInJXW9WajgSeW+cxYe0UVdouzCtcreGNuJo7A==", - "requires": { - "@octokit/types": "^6.0.1", - "bottleneck": "^2.15.3" - } - }, - "@octokit/request": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.2.tgz", - "integrity": "sha512-je66CvSEVf0jCpRISxkUcCa0UkxmFs6eGDRSbfJtAVwbLH5ceqF+YEyC8lj8ystKyZTy8adWr0qmkY52EfOeLA==", - "requires": { - "@octokit/endpoint": "^6.0.1", - "@octokit/request-error": "^2.1.0", - "@octokit/types": "^6.16.1", - "is-plain-object": "^5.0.0", - "node-fetch": "^2.6.1", - "universal-user-agent": "^6.0.0" - } - }, - "@octokit/request-error": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz", - "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==", - "requires": { - "@octokit/types": "^6.0.3", - "deprecation": "^2.0.0", - "once": "^1.4.0" - } - }, - "@octokit/rest": { - "version": "18.12.0", - "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz", - "integrity": "sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==", - "requires": { - "@octokit/core": "^3.5.1", - "@octokit/plugin-paginate-rest": "^2.16.8", - "@octokit/plugin-request-log": "^1.0.4", - "@octokit/plugin-rest-endpoint-methods": "^5.12.0" - } - }, - "@octokit/types": { - "version": "6.33.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.33.0.tgz", - "integrity": "sha512-0zffZ048M0UhthyPXQHLz4038Ak46nMWZXkzlXvXB/M/L1jYPBceq4iZj4qjKVrvveaJrrgKdJ9+3yUuITfcCw==", - "requires": { - "@octokit/openapi-types": "^11.1.0" - } - }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "before-after-hook": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz", - "integrity": "sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==" - }, - "bottleneck": { - "version": "2.19.5", - "resolved": "https://registry.npmjs.org/bottleneck/-/bottleneck-2.19.5.tgz", - "integrity": "sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw==" - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "deprecation": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz", - "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==" - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, - "glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "is-plain-object": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==" - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "requires": { - "whatwg-url": "^5.0.0" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "requires": { - "wrappy": "1" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" - }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" - }, - "universal-user-agent": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz", - "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==" - }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" - }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" - } - } -} diff --git a/.github/workflows/scripts/releases/upload-release-artifacts/package.json b/.github/workflows/scripts/releases/upload-release-artifacts/package.json deleted file mode 100644 index 267a187269..0000000000 --- a/.github/workflows/scripts/releases/upload-release-artifacts/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "upload-release-artifacts", - "version": "1.0.0", - "description": "", - "main": "index.js", - "type": "module", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "", - "license": "ISC", - "dependencies": { - "@octokit/plugin-retry": "^3.0.9", - "@octokit/plugin-throttling": "^3.5.2", - "@octokit/rest": "^18.12.0", - "glob": "^7.2.0" - } -} diff --git a/.github/workflows/windows-workflow.yml b/.github/workflows/windows-workflow.yml deleted file mode 100644 index 14be6afc93..0000000000 --- a/.github/workflows/windows-workflow.yml +++ /dev/null @@ -1,206 +0,0 @@ -name: 🖥️ Windows Builds - -# Controls when the action will run. Triggers the workflow on push or pull request -# events but only for the master branch -on: - push: - branches: - - master - tags: - - v* - pull_request: - branches: - - master - paths-ignore: - - '**/*.md' - - '.clang-format' - - '.codacy.yaml' - - '.github/*' - - '.github/workflows/lint-gamedb.yml' - - '.github/workflows/linux-workflow.yml' - - '.github/workflows/macos-workflow.yml' - - '.github/workflows/scripts/linux/**' - - '.github/workflows/scripts/validation/**' - - '.gitignore' - - 'bin/PCSX2_keys.ini.default' - - 'build.sh' - - 'buildbot.xml' - - 'linux_various/**' - - 'mscompile.cmd' - - 'pcsx2/CDVD/Linux/**' - - 'pcsx2/DEV9/Linux/**' - - 'pcsx2/Linux/**' - - 'pcsx2/PAD/Linux/**' - - 'pcsx2/SPU2/Linux/**' - - 'pcsx2/USB/linux/**' - -jobs: - build: - strategy: - # Prevent one build from failing everything (although maybe those should be included as experimental builds instead) - fail-fast: false - matrix: - os: [windows-2019] - platform: [x64] - configuration: [Release, Release AVX2, CMake, Qt] - experimental: [false] - - name: ${{ matrix.configuration }} - runs-on: ${{ matrix.os }} - continue-on-error: ${{ matrix.experimental }} - # Set some sort of timeout in the event of run-away builds. We are limited on concurrent jobs so, get rid of them. - timeout-minutes: 60 - - env: - POWERSHELL_TELEMETRY_OPTOUT: 1 - BUILDCACHE_COMPRESS_FORMAT: ZSTD - BUILDCACHE_COMPRESS_LEVEL: 9 - BUILDCACHE_MAX_CACHE_SIZE: 536870912 # 512MB - BUILDCACHE_DIRECT_MODE: true - BUILDCACHE_LOG_FILE: ${{ github.workspace }}\buildcache.log - - steps: - - name: Checkout Repository - uses: actions/checkout@v3 - - - name: Checkout Submodules - run: git submodule update --init --recursive -j $env:NUMBER_OF_PROCESSORS - - - name: Setup Buildcache - if: matrix.configuration == 'CMake' # TODO: buildcache on VS - uses: mikehardy/buildcache-action@v1.2.2 - with: - cache_key: ${{ matrix.os }} ${{ matrix.platform }} ${{ matrix.configuration }} - - - name: Verify VS Project Files - if: matrix.configuration != 'CMake' - run: .github\workflows\scripts\windows\validate-vs-filters.ps1 - - - name: Setup msbuild - if: matrix.configuration != 'CMake' - uses: microsoft/setup-msbuild@v1 - - - name: Download Qt build files - if: matrix.configuration == 'Qt' - shell: cmd - run: | - cd 3rdparty\qt - aria2c https://github.com/PCSX2/pcsx2-windows-dependencies/releases/download/2022-04-13/qt-6.3.0-x64.7z - 7z x qt-6.3.0-x64.7z - del qt-6.3.0-x64.7z - - - name: Generate CMake - if: matrix.configuration == 'CMake' - id: cmake - shell: cmd - run: | - if "${{ github.event.inputs.retainDebugArtifacts }}"=="true" (SET type=RelWithDebInfo) else (SET type=Release) - if "${{ matrix.platform }}"=="Win32" (SET vcvars=vcvarsamd64_x86.bat) else (SET vcvars=vcvars64.bat) - call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\%vcvars%" - echo ::set-output name=buildtype::%type% - echo ::set-output name=vcvars::%vcvars% - cmake . -B build -DCMAKE_BUILD_TYPE=%type% -DLTO_PCSX2_CORE=ON -G Ninja -DCMAKE_C_COMPILER_LAUNCHER=..\buildcache\bin\buildcache.exe -DCMAKE_CXX_COMPILER_LAUNCHER=..\buildcache\bin\buildcache.exe -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON - - - name: Build PCSX2 - shell: cmd - env: - # Set to 'true' to retain the .pdb / .exp / .lib, etc files which can be useful for repro'ing issues that only occur in the compiled .exe - RetainDebuggingArtifacts: ${{ github.event.inputs.retainDebugArtifacts == 'true' }} - run: | - if "${{ matrix.configuration }}"=="CMake" ( - call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\${{ steps.cmake.outputs.vcvars }}" - cmake --build build --config ${{ steps.cmake.outputs.buildtype }} - ) else ( - if "${{ matrix.configuration }}"=="Qt" ( - rem This is hardcoded to Release AVX2 for now, because of the artifact naming below. - msbuild "PCSX2_qt.sln" /m /v:m /p:Configuration="Release AVX2" /p:Platform="${{ matrix.platform }}" - ) else ( - msbuild "PCSX2_suite.sln" /m /v:m /p:Configuration="${{ matrix.configuration }}" /p:Platform="${{ matrix.platform }}" - ) - ) - - - name: Run Tests - if: matrix.configuration == 'CMake' - shell: cmd - run: | - call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\${{ steps.cmake.outputs.vcvars }}" - cmake --build build --config ${{ steps.cmake.outputs.buildtype }} --target unittests - - - name: Prepare Artifact Metadata - id: artifact-metadata - shell: bash - run: | - ARCH=$([ "${{ matrix.platform }}" == Win32 ] && echo "32bit" || echo "64bit") - case "${{ matrix.configuration }}" in - Release) SIMD="SSE4";; - *AVX2) SIMD="AVX2";; - Qt) SIMD="QT";; - CMake) SIMD="CMake" - cp build/pcsx2/pcsx2* bin/ ;; - *) SIMD="UNKNOWN";; - esac - if [ ${{ github.event_name }} == "pull_request" ]; then - PR_SHA=$(git rev-parse --short "${{ github.event.pull_request.head.sha }}") - ARTIFACT_NAME="PCSX2-${ARCH}-${SIMD}" - if [ ! -z "${{ github.event.pull_request.number }}" ]; then - PR_NUM=${{ github.event.pull_request.number }} - ARTIFACT_NAME="${ARTIFACT_NAME}-pr[${PR_NUM}]" - fi - ARTIFACT_NAME="${ARTIFACT_NAME}-sha[${PR_SHA}]" - if [ ! -z "${{ github.event.pull_request.title }}" ]; then - PR_TITLE=$(echo "${{ github.event.pull_request.title }}" | tr -cd '[a-zA-Z0-9[:space:]]_-') - ARTIFACT_NAME="${ARTIFACT_NAME}-title["${PR_TITLE}"" - fi - else - SHA=$(git rev-parse --short "$GITHUB_SHA") - ARTIFACT_NAME="PCSX2-${ARCH}-${SIMD}-sha[${SHA}" - fi - TRIMMED_ARTIFACT_NAME=$(printf "%.199s]" "$ARTIFACT_NAME") - echo "name=$TRIMMED_ARTIFACT_NAME" - echo "##[set-output name=name;]${TRIMMED_ARTIFACT_NAME}" - echo "##[set-output name=arch;]${ARCH}" - echo "##[set-output name=simd;]${SIMD}" - - - name: Upload artifact - uses: actions/upload-artifact@v3 - continue-on-error: true - with: - name: ${{ steps.artifact-metadata.outputs.name }} - path: | - ./bin - !./bin/**/*.bsc - !./bin/**/*.exp - !./bin/**/*.ilk - !./bin/**/*.iobj - !./bin/**/*.ipdb - !./bin/**/*.pdb - !./bin/**/*.lib - - - name: Upload artifact - with symbols - if: matrix.configuration != 'CMake' - uses: actions/upload-artifact@v3 - continue-on-error: true - with: - name: ${{ steps.artifact-metadata.outputs.name }}-symbols - path: ./bin/**/*.pdb - - # ---- Release / Tagging related steps ---- - - name: Prepare Build Artifacts - if: github.repository == 'PCSX2/pcsx2' && startsWith(github.ref, 'refs/tags/') && matrix.configuration != 'CMake' && matrix.configuration != 'Qt' - run: | - mkdir -p ./ci-artifacts/ - 7z a ./ci-artifacts/windows-${{ steps.artifact-metadata.outputs.arch }}-${{ steps.artifact-metadata.outputs.simd }}.7z ./bin/* '-xr!*bsc' '-xr!*.exp' '-xr!*.ilk' '-xr!*.iobj' '-xr!*.ipdb' '-xr!*.pdb' '-xr!*.lib' - 7z a ./ci-artifacts/windows-${{ steps.artifact-metadata.outputs.arch }}-${{ steps.artifact-metadata.outputs.simd }}-symbols.7z ./bin/*.pdb - ls ./ci-artifacts/ - - - name: Upload Assets and Potential Publish Release - if: github.repository == 'PCSX2/pcsx2' && startsWith(github.ref, 'refs/tags/') && matrix.configuration != 'CMake' && matrix.configuration != 'Qt' - env: - GITHUB_TOKEN: ${{ secrets.BOT_PAT }} - ASSET_DIR: ${{ github.WORKSPACE }}/ci-artifacts - ASSET_EXTENSION: 7z - TAG_TO_SEARCH_FOR: ${{ github.REF }} - run: | - cd ./.github/workflows/scripts/releases/upload-release-artifacts - npm ci - node index.js diff --git a/.github/workflows/windows_build_matrix.yml b/.github/workflows/windows_build_matrix.yml index 6c72805de7..bc3dfd819c 100644 --- a/.github/workflows/windows_build_matrix.yml +++ b/.github/workflows/windows_build_matrix.yml @@ -19,7 +19,7 @@ jobs: - name: Verify VS Project Files run: .github\workflows\scripts\windows\validate-vs-filters.ps1 - build_wx: + build_wx_sse4: needs: lint_vs_proj_files name: "SSE4" uses: ./.github/workflows/windows_build_wx.yml @@ -38,6 +38,16 @@ jobs: configuration: Release AVX2 secrets: inherit + build_qt_sse4: + needs: lint_vs_proj_files + name: "SSE4" + uses: ./.github/workflows/windows_build_qt.yml + with: + jobName: Qt + configuration: Release + simd: "SSE4" + secrets: inherit + build_qt_avx2: needs: lint_vs_proj_files name: "AVX2"