From f42c6e777c908fa97b469ce591d3dddc871f3c03 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 01:57:42 -0300 Subject: [PATCH 01/16] 123 --- .forgejo/workflows/ci.yml | 27 ++++++++++++---------- .forgejo/workflows/codespell.yml | 9 ++++++-- .forgejo/workflows/verify.yml | 39 +++++++++++++++++--------------- 3 files changed, 43 insertions(+), 32 deletions(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 25ef1f0789..f4ed12a94d 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -1,33 +1,36 @@ # SPDX-FileCopyrightText: 2021 yuzu Emulator Project +# SPDX-FileCopyrightText: 2024 suyu Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later -name: yuzu-ci +# Actions Documentation: https://forgejo.org/docs/next/user/actions/#list-of-tasks-in-a-repository + +name: suyu-ci on: push: - branches: [ master ] + branches: [ dev ] tags: [ "*" ] pull_request: - branches: [ master ] + branches: [ dev ] jobs: transifex: runs-on: ubuntu-latest container: yuzuemu/build-environments:linux-transifex - if: ${{ github.repository == 'yuzu-emu/yuzu' && !github.head_ref }} + if: ${{ GITHUB_REPOSITORY == 'yuzu-emu/yuzu' && !GITHUB_HEAD_REF }} steps: - - uses: actions/checkout@v3 + - uses: https://code.forgejo.org/actions/checkout@v3 with: submodules: recursive fetch-depth: 0 - - name: Update Translation - run: ./.ci/scripts/transifex/docker.sh - env: - TX_TOKEN: ${{ secrets.TRANSIFEX_API_TOKEN }} + # - name: Update Translation + # run: ./.ci/scripts/transifex/docker.sh + # env: + # TX_TOKEN: ${{ secrets.TRANSIFEX_API_TOKEN }} reuse: runs-on: ubuntu-latest - if: ${{ github.repository == 'yuzu-emu/yuzu' }} + if: ${{ GITHUB_REPOSITORY == 'suyu/suyu' }} steps: - - uses: actions/checkout@v3 - - uses: fsfe/reuse-action@v1 + - uses: https://code.forgejo.org/actions/checkout@v3 + - uses: https://github.com/fsfe/reuse-action@v1 diff --git a/.forgejo/workflows/codespell.yml b/.forgejo/workflows/codespell.yml index d873fb725c..e3e7e49a67 100644 --- a/.forgejo/workflows/codespell.yml +++ b/.forgejo/workflows/codespell.yml @@ -1,8 +1,13 @@ # SPDX-FileCopyrightText: 2023 yuzu Emulator Project +# SPDX-FileCopyrightText: 2024 suyu Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later +# # GitHub Action to automate the identification of common misspellings in text files. # https://github.com/codespell-project/actions-codespell # https://github.com/codespell-project/codespell + +# Actions Documentation: https://forgejo.org/docs/next/user/actions/#list-of-tasks-in-a-repository + name: codespell on: pull_request permissions: {} @@ -11,7 +16,7 @@ jobs: name: Check for spelling errors runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: https://code.forgejo.org/actions/checkout@v3 with: persist-credentials: false - - uses: codespell-project/actions-codespell@master + - uses: https://github.com/codespell-project/actions-codespell diff --git a/.forgejo/workflows/verify.yml b/.forgejo/workflows/verify.yml index a9e28eefd0..0236118822 100644 --- a/.forgejo/workflows/verify.yml +++ b/.forgejo/workflows/verify.yml @@ -1,11 +1,14 @@ # SPDX-FileCopyrightText: 2022 yuzu Emulator Project +# SPDX-FileCopyrightText: 2024 suyu Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later -name: 'yuzu verify' +# Actions Documentation: https://forgejo.org/docs/next/user/actions/#list-of-tasks-in-a-repository + +name: 'suyu verify' on: pull_request: - branches: [ master ] + branches: [ dev ] env: PR_NUMBER: pr${{ github.event.number }} @@ -14,11 +17,11 @@ jobs: name: 'verify format' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: https://code.forgejo.org/actions/checkout@v3 with: submodules: false - name: set up JDK 17 - uses: actions/setup-java@v3 + uses: https://github.com/actions/setup-java@v3 with: java-version: '17' distribution: 'temurin' @@ -42,12 +45,12 @@ jobs: image: yuzuemu/build-environments:${{ matrix.image }} options: -u 1001 steps: - - uses: actions/checkout@v3 + - uses: https://code.forgejo.org/actions/checkout@v3 with: submodules: recursive fetch-depth: 0 - name: Set up cache - uses: actions/cache@v3 + uses: https://code.forgejo.org/actions/cache@v3 id: ccache-restore with: path: ~/.ccache @@ -66,7 +69,7 @@ jobs: env: NO_SOURCE_PACK: "YES" - name: Upload - uses: actions/upload-artifact@v3 + uses: https://code.forgejo.org/actions/upload-artifact@v3 with: name: ${{ matrix.type }} path: artifacts/ @@ -75,7 +78,7 @@ jobs: needs: format runs-on: macos-14 steps: - - uses: actions/checkout@v3 + - uses: https://code.forgejo.org/actions/checkout@v3 with: submodules: recursive fetch-depth: 0 @@ -94,12 +97,12 @@ jobs: needs: format runs-on: windows-2022 steps: - - uses: actions/checkout@v3 + - uses: https://code.forgejo.org/actions/checkout@v3 with: submodules: recursive fetch-depth: 0 - name: Set up cache - uses: actions/cache@v3 + uses: https://code.forgejo.org/actions/cache@v3 with: path: ~/.buildcache key: ${{ runner.os }}-msvc-${{ github.sha }} @@ -121,7 +124,7 @@ jobs: shell: pwsh run: .\.ci\scripts\windows\install-vulkan-sdk.ps1 - name: Set up MSVC - uses: ilammy/msvc-dev-cmd@v1 + uses: https://github.com/ilammy/msvc-dev-cmd@v1 - name: Configure env: CC: cl.exe @@ -138,12 +141,12 @@ jobs: shell: pwsh run: .\.ci\scripts\windows\upload.ps1 - name: Upload - uses: actions/upload-artifact@v3 + uses: https://code.forgejo.org/actions/upload-artifact@v3 with: name: msvc path: artifacts/ - name: Upload EXE - uses: actions/upload-artifact@v3 + uses: https://code.forgejo.org/actions/upload-artifact@v3 with: name: ${{ env.INDIVIDUAL_EXE }} path: ${{ env.INDIVIDUAL_EXE }} @@ -151,17 +154,17 @@ jobs: runs-on: ubuntu-latest needs: format steps: - - uses: actions/checkout@v3 + - uses: https://code.forgejo.org/actions/checkout@v3 with: submodules: recursive fetch-depth: 0 - name: set up JDK 17 - uses: actions/setup-java@v3 + uses: https://github.com/actions/setup-java@v3 with: java-version: '17' distribution: 'temurin' - name: Set up cache - uses: actions/cache@v3 + uses: https://code.forgejo.org/actions/cache@v3 with: path: | ~/.gradle/caches @@ -171,7 +174,7 @@ jobs: restore-keys: | ${{ runner.os }}-android- - name: Query tag name - uses: olegtarasov/get-tag@v2.1.2 + uses: https://github.com/olegtarasov/get-tag@v2.1.2 id: tagName - name: Install dependencies run: | @@ -186,7 +189,7 @@ jobs: ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }} run: ./.ci/scripts/android/upload.sh - name: Upload - uses: actions/upload-artifact@v3 + uses: https://code.forgejo.org/actions/upload-artifact@v3 with: name: android path: artifacts/ From c585a71271e2fea737f103b553916c8b94e8ab4e Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 11:42:16 -0300 Subject: [PATCH 02/16] 123 --- .forgejo/workflows/codespell.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/codespell.yml b/.forgejo/workflows/codespell.yml index e3e7e49a67..5b4a5f1706 100644 --- a/.forgejo/workflows/codespell.yml +++ b/.forgejo/workflows/codespell.yml @@ -9,7 +9,13 @@ # Actions Documentation: https://forgejo.org/docs/next/user/actions/#list-of-tasks-in-a-repository name: codespell -on: pull_request +on: + push: + branches: [ * ] + tags: [ "*" ] + pull_request: + branches: [ * ] + permissions: {} jobs: codespell: From ac1dd880c2fc66a9bf87a6c542f96c046a782b0d Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 11:43:56 -0300 Subject: [PATCH 03/16] test123 --- src/video_core/vulkan_common/vulkan_device.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h index 79f62b9241..15dc7b789c 100644 --- a/src/video_core/vulkan_common/vulkan_device.h +++ b/src/video_core/vulkan_common/vulkan_device.h @@ -702,7 +702,7 @@ public: return properties.driver.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY; } - /// Checks if we are runing MolvenVK. + /// Checks if we are running MolvenVK. bool IsMoltenVK() const noexcept { return properties.driver.driverID == VK_DRIVER_ID_MOLTENVK; } From 554801516266e497d9590810ca3ee4423811b283 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 11:46:42 -0300 Subject: [PATCH 04/16] test123 --- .forgejo/workflows/codespell.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/codespell.yml b/.forgejo/workflows/codespell.yml index 5b4a5f1706..415d2c062b 100644 --- a/.forgejo/workflows/codespell.yml +++ b/.forgejo/workflows/codespell.yml @@ -11,10 +11,10 @@ name: codespell on: push: - branches: [ * ] + branches: [ "*" ] tags: [ "*" ] pull_request: - branches: [ * ] + branches: [ "*" ] permissions: {} jobs: From c247c3f0b2074df22d91609db22fa66a19c8d603 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 11:47:36 -0300 Subject: [PATCH 05/16] test1234 --- .forgejo/workflows/codespell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/codespell.yml b/.forgejo/workflows/codespell.yml index 415d2c062b..65fbbcce46 100644 --- a/.forgejo/workflows/codespell.yml +++ b/.forgejo/workflows/codespell.yml @@ -25,4 +25,4 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v3 with: persist-credentials: false - - uses: https://github.com/codespell-project/actions-codespell + - uses: https://github.com/codespell-project/actions-codespell@master From 5fb39a12491b5e0d7cdcdd65d48c3679a7208848 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 16:21:51 -0300 Subject: [PATCH 06/16] test12345678 --- .forgejo/workflows/ci.yml | 30 +++++++++++++++--------------- .forgejo/workflows/verify.yml | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index f4ed12a94d..fcb85b7802 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -8,25 +8,25 @@ name: suyu-ci on: push: - branches: [ dev ] + branches: [ "dev" ] tags: [ "*" ] pull_request: - branches: [ dev ] + branches: [ "dev" ] jobs: - transifex: - runs-on: ubuntu-latest - container: yuzuemu/build-environments:linux-transifex - if: ${{ GITHUB_REPOSITORY == 'yuzu-emu/yuzu' && !GITHUB_HEAD_REF }} - steps: - - uses: https://code.forgejo.org/actions/checkout@v3 - with: - submodules: recursive - fetch-depth: 0 - # - name: Update Translation - # run: ./.ci/scripts/transifex/docker.sh - # env: - # TX_TOKEN: ${{ secrets.TRANSIFEX_API_TOKEN }} +# transifex: +# runs-on: ubuntu-latest +# container: fijxu/build-environments:linux-transifex +# if: ${{ GITHUB_REPOSITORY == 'suyu/suyu' && !GITHUB_HEAD_REF }} +# steps: +# - uses: https://code.forgejo.org/actions/checkout@v3 +# with: +# submodules: recursive +# fetch-depth: 0 +# - name: Update Translation +# run: ./.ci/scripts/transifex/docker.sh +# env: +# TX_TOKEN: ${{ secrets.TRANSIFEX_API_TOKEN }} reuse: runs-on: ubuntu-latest diff --git a/.forgejo/workflows/verify.yml b/.forgejo/workflows/verify.yml index 0236118822..691019c948 100644 --- a/.forgejo/workflows/verify.yml +++ b/.forgejo/workflows/verify.yml @@ -8,7 +8,7 @@ name: 'suyu verify' on: pull_request: - branches: [ dev ] + branches: [ "dev" ] env: PR_NUMBER: pr${{ github.event.number }} @@ -42,7 +42,7 @@ jobs: - type: windows image: linux-mingw container: - image: yuzuemu/build-environments:${{ matrix.image }} + image: fijxu/build-environments:${{ matrix.image }} options: -u 1001 steps: - uses: https://code.forgejo.org/actions/checkout@v3 From fd552af2573bc724a3d543e52ab10eb172ad4d7f Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 16:23:13 -0300 Subject: [PATCH 07/16] . --- .forgejo/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index fcb85b7802..0851617484 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -8,10 +8,10 @@ name: suyu-ci on: push: - branches: [ "dev" ] + branches: [ "forgejo-ci-testing" ] tags: [ "*" ] pull_request: - branches: [ "dev" ] + branches: [ "forgejo-ci-testing" ] jobs: # transifex: From 93b6520a4823e1473ff2a4240e8f1f408eef115a Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 17:14:18 -0300 Subject: [PATCH 08/16] huh --- .forgejo/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 0851617484..7175ea318a 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: reuse: runs-on: ubuntu-latest - if: ${{ GITHUB_REPOSITORY == 'suyu/suyu' }} + if: ${{ github.repository == 'suyu/suyu' }} steps: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://github.com/fsfe/reuse-action@v1 From 67b726d29424dbae8b2dae350b2c4652bc4f97d4 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 17:22:53 -0300 Subject: [PATCH 09/16] fix: Use proper REUSE Specification --- .gitlab-ci.yml | 3 +++ README.md | 2 +- dist/icns_generator.sh | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3963969db6..bae87cf8cb 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2024 suyu Emulator Project +# SPDX-License-Identifier: GPL-3.0-or-later + stages: - format - build diff --git a/README.md b/README.md index eeb0acf0a3..bb124dd621 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ **Note**: We do not support or condone piracy in any form. In order to use suyu, you'll need keys from your real Switch system, and games which you have legally obtained and paid for. We do not intend to make money or profit from this project. diff --git a/dist/icns_generator.sh b/dist/icns_generator.sh index 3723483754..acd0122e68 100755 --- a/dist/icns_generator.sh +++ b/dist/icns_generator.sh @@ -1,5 +1,9 @@ #!/bin/bash -# icns_generator.sh GNU GPLv3 License + +# SPDX-FileCopyrightText: 2024 suyu Emulator Project +# SPDX-License-Identifier: GPL-3.0-or-later + +# icns_generator.sh # Run this script when a new logo is made and the svg file inside. # You should install Imagemagick to make the conversions: $brew install imagemagick From ab190e20b1850d258a5061e448083e853ff89488 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 17:31:28 -0300 Subject: [PATCH 10/16] chore: we don't have windows nor macos runners --- .forgejo/workflows/verify.yml | 156 +++++++++++++++++----------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/.forgejo/workflows/verify.yml b/.forgejo/workflows/verify.yml index 691019c948..7d1651d5e4 100644 --- a/.forgejo/workflows/verify.yml +++ b/.forgejo/workflows/verify.yml @@ -27,7 +27,7 @@ jobs: distribution: 'temurin' - name: 'Verify Formatting' run: bash -ex ./.ci/scripts/format/script.sh - build: + build-linux: name: 'test build' needs: format runs-on: ubuntu-latest @@ -73,83 +73,83 @@ jobs: with: name: ${{ matrix.type }} path: artifacts/ - build-mac: - name: 'test build (macos)' - needs: format - runs-on: macos-14 - steps: - - uses: https://code.forgejo.org/actions/checkout@v3 - with: - submodules: recursive - fetch-depth: 0 - - name: Install dependencies - run: | - brew install autoconf automake boost ccache ffmpeg fmt glslang hidapi libtool libusb lz4 ninja nlohmann-json openssl pkg-config qt@5 sdl2 speexdsp zlib zlib zstd - - name: Build - run: | - mkdir build - cd build - export Qt5_DIR="$(brew --prefix qt@5)/lib/cmake" - cmake .. -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSUYU_USE_BUNDLED_VCPKG=OFF -DSUYU_TESTS=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_LIBUSB=OFF - ninja - build-msvc: - name: 'test build (windows, msvc)' - needs: format - runs-on: windows-2022 - steps: - - uses: https://code.forgejo.org/actions/checkout@v3 - with: - submodules: recursive - fetch-depth: 0 - - name: Set up cache - uses: https://code.forgejo.org/actions/cache@v3 - with: - path: ~/.buildcache - key: ${{ runner.os }}-msvc-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-msvc- - - name: Install dependencies - shell: pwsh - run: | - $ErrorActionPreference = "Stop" - $BuildCacheVer = "v0.28.4" - $File = "buildcache-windows.zip" - $Uri = "https://github.com/mbitsnbites/buildcache/releases/download/$BuildCacheVer/$File" - $WebClient = New-Object System.Net.WebClient - $WebClient.DownloadFile($Uri, $File) - 7z x $File - $CurrentDir = Convert-Path . - echo "$CurrentDir/buildcache/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - - name: Install Vulkan SDK - shell: pwsh - run: .\.ci\scripts\windows\install-vulkan-sdk.ps1 - - name: Set up MSVC - uses: https://github.com/ilammy/msvc-dev-cmd@v1 - - name: Configure - env: - CC: cl.exe - CXX: cl.exe - run: | - glslangValidator --version - mkdir build - cmake . -B build -GNinja -DCMAKE_TOOLCHAIN_FILE="CMakeModules/MSVCCache.cmake" -DUSE_CCACHE=ON -DSUYU_USE_BUNDLED_QT=1 -DSUYU_USE_BUNDLED_SDL2=1 -DSUYU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DSUYU_ENABLE_COMPATIBILITY_REPORTING=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DGIT_BRANCH=pr-verify -DSUYU_CRASH_DUMPS=ON - - name: Build - run: cmake --build build - - name: Cache Summary - run: buildcache -s - - name: Pack - shell: pwsh - run: .\.ci\scripts\windows\upload.ps1 - - name: Upload - uses: https://code.forgejo.org/actions/upload-artifact@v3 - with: - name: msvc - path: artifacts/ - - name: Upload EXE - uses: https://code.forgejo.org/actions/upload-artifact@v3 - with: - name: ${{ env.INDIVIDUAL_EXE }} - path: ${{ env.INDIVIDUAL_EXE }} + # build-mac: + # name: 'test build (macos)' + # needs: format + # runs-on: macos-14 + # steps: + # - uses: https://code.forgejo.org/actions/checkout@v3 + # with: + # submodules: recursive + # fetch-depth: 0 + # - name: Install dependencies + # run: | + # brew install autoconf automake boost ccache ffmpeg fmt glslang hidapi libtool libusb lz4 ninja nlohmann-json openssl pkg-config qt@5 sdl2 speexdsp zlib zlib zstd + # - name: Build + # run: | + # mkdir build + # cd build + # export Qt5_DIR="$(brew --prefix qt@5)/lib/cmake" + # cmake .. -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSUYU_USE_BUNDLED_VCPKG=OFF -DSUYU_TESTS=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_LIBUSB=OFF + # ninja + # build-msvc: + # name: 'test build (windows, msvc)' + # needs: format + # runs-on: windows-2022 + # steps: + # - uses: https://code.forgejo.org/actions/checkout@v3 + # with: + # submodules: recursive + # fetch-depth: 0 + # - name: Set up cache + # uses: https://code.forgejo.org/actions/cache@v3 + # with: + # path: ~/.buildcache + # key: ${{ runner.os }}-msvc-${{ github.sha }} + # restore-keys: | + # ${{ runner.os }}-msvc- + # - name: Install dependencies + # shell: pwsh + # run: | + # $ErrorActionPreference = "Stop" + # $BuildCacheVer = "v0.28.4" + # $File = "buildcache-windows.zip" + # $Uri = "https://github.com/mbitsnbites/buildcache/releases/download/$BuildCacheVer/$File" + # $WebClient = New-Object System.Net.WebClient + # $WebClient.DownloadFile($Uri, $File) + # 7z x $File + # $CurrentDir = Convert-Path . + # echo "$CurrentDir/buildcache/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + # - name: Install Vulkan SDK + # shell: pwsh + # run: .\.ci\scripts\windows\install-vulkan-sdk.ps1 + # - name: Set up MSVC + # uses: https://github.com/ilammy/msvc-dev-cmd@v1 + # - name: Configure + # env: + # CC: cl.exe + # CXX: cl.exe + # run: | + # glslangValidator --version + # mkdir build + # cmake . -B build -GNinja -DCMAKE_TOOLCHAIN_FILE="CMakeModules/MSVCCache.cmake" -DUSE_CCACHE=ON -DSUYU_USE_BUNDLED_QT=1 -DSUYU_USE_BUNDLED_SDL2=1 -DSUYU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DSUYU_ENABLE_COMPATIBILITY_REPORTING=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DGIT_BRANCH=pr-verify -DSUYU_CRASH_DUMPS=ON + # - name: Build + # run: cmake --build build + # - name: Cache Summary + # run: buildcache -s + # - name: Pack + # shell: pwsh + # run: .\.ci\scripts\windows\upload.ps1 + # - name: Upload + # uses: https://code.forgejo.org/actions/upload-artifact@v3 + # with: + # name: msvc + # path: artifacts/ + # - name: Upload EXE + # uses: https://code.forgejo.org/actions/upload-artifact@v3 + # with: + # name: ${{ env.INDIVIDUAL_EXE }} + # path: ${{ env.INDIVIDUAL_EXE }} android: runs-on: ubuntu-latest needs: format From 8ae8c85c695a3a58a4e6c1b70c54bed2db46e71a Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 17:32:50 -0300 Subject: [PATCH 11/16] fix: move .github folder to prevent actions conflicts --- .../ISSUE_TEMPLATE/blank_issue_template.yml | 0 {.github => .github-archive}/ISSUE_TEMPLATE/bug_report.yml | 0 {.github => .github-archive}/ISSUE_TEMPLATE/config.yml | 0 {.github => .github-archive}/ISSUE_TEMPLATE/feature_request.yml | 0 {.github => .github-archive}/workflows/android-build.yml | 0 .../workflows/android-ea-play-release.yml | 0 .../workflows/android-mainline-play-release.yml | 0 {.github => .github-archive}/workflows/android-merge.js | 0 {.github => .github-archive}/workflows/android-publish.yml | 0 {.github => .github-archive}/workflows/ci.yml | 0 {.github => .github-archive}/workflows/codespell.yml | 0 {.github => .github-archive}/workflows/verify.yml | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename {.github => .github-archive}/ISSUE_TEMPLATE/blank_issue_template.yml (100%) rename {.github => .github-archive}/ISSUE_TEMPLATE/bug_report.yml (100%) rename {.github => .github-archive}/ISSUE_TEMPLATE/config.yml (100%) rename {.github => .github-archive}/ISSUE_TEMPLATE/feature_request.yml (100%) rename {.github => .github-archive}/workflows/android-build.yml (100%) rename {.github => .github-archive}/workflows/android-ea-play-release.yml (100%) rename {.github => .github-archive}/workflows/android-mainline-play-release.yml (100%) rename {.github => .github-archive}/workflows/android-merge.js (100%) rename {.github => .github-archive}/workflows/android-publish.yml (100%) rename {.github => .github-archive}/workflows/ci.yml (100%) rename {.github => .github-archive}/workflows/codespell.yml (100%) rename {.github => .github-archive}/workflows/verify.yml (100%) diff --git a/.github/ISSUE_TEMPLATE/blank_issue_template.yml b/.github-archive/ISSUE_TEMPLATE/blank_issue_template.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/blank_issue_template.yml rename to .github-archive/ISSUE_TEMPLATE/blank_issue_template.yml diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github-archive/ISSUE_TEMPLATE/bug_report.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/bug_report.yml rename to .github-archive/ISSUE_TEMPLATE/bug_report.yml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github-archive/ISSUE_TEMPLATE/config.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/config.yml rename to .github-archive/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github-archive/ISSUE_TEMPLATE/feature_request.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/feature_request.yml rename to .github-archive/ISSUE_TEMPLATE/feature_request.yml diff --git a/.github/workflows/android-build.yml b/.github-archive/workflows/android-build.yml similarity index 100% rename from .github/workflows/android-build.yml rename to .github-archive/workflows/android-build.yml diff --git a/.github/workflows/android-ea-play-release.yml b/.github-archive/workflows/android-ea-play-release.yml similarity index 100% rename from .github/workflows/android-ea-play-release.yml rename to .github-archive/workflows/android-ea-play-release.yml diff --git a/.github/workflows/android-mainline-play-release.yml b/.github-archive/workflows/android-mainline-play-release.yml similarity index 100% rename from .github/workflows/android-mainline-play-release.yml rename to .github-archive/workflows/android-mainline-play-release.yml diff --git a/.github/workflows/android-merge.js b/.github-archive/workflows/android-merge.js similarity index 100% rename from .github/workflows/android-merge.js rename to .github-archive/workflows/android-merge.js diff --git a/.github/workflows/android-publish.yml b/.github-archive/workflows/android-publish.yml similarity index 100% rename from .github/workflows/android-publish.yml rename to .github-archive/workflows/android-publish.yml diff --git a/.github/workflows/ci.yml b/.github-archive/workflows/ci.yml similarity index 100% rename from .github/workflows/ci.yml rename to .github-archive/workflows/ci.yml diff --git a/.github/workflows/codespell.yml b/.github-archive/workflows/codespell.yml similarity index 100% rename from .github/workflows/codespell.yml rename to .github-archive/workflows/codespell.yml diff --git a/.github/workflows/verify.yml b/.github-archive/workflows/verify.yml similarity index 100% rename from .github/workflows/verify.yml rename to .github-archive/workflows/verify.yml From d2c1e4d326abea980eec02334fdc2584dfbc73a7 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 17:34:44 -0300 Subject: [PATCH 12/16] 123 --- .forgejo/workflows/fuck.yml | 195 ++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) create mode 100644 .forgejo/workflows/fuck.yml diff --git a/.forgejo/workflows/fuck.yml b/.forgejo/workflows/fuck.yml new file mode 100644 index 0000000000..7d1651d5e4 --- /dev/null +++ b/.forgejo/workflows/fuck.yml @@ -0,0 +1,195 @@ +# SPDX-FileCopyrightText: 2022 yuzu Emulator Project +# SPDX-FileCopyrightText: 2024 suyu Emulator Project +# SPDX-License-Identifier: GPL-3.0-or-later + +# Actions Documentation: https://forgejo.org/docs/next/user/actions/#list-of-tasks-in-a-repository + +name: 'suyu verify' + +on: + pull_request: + branches: [ "dev" ] +env: + PR_NUMBER: pr${{ github.event.number }} + +jobs: + format: + name: 'verify format' + runs-on: ubuntu-latest + steps: + - uses: https://code.forgejo.org/actions/checkout@v3 + with: + submodules: false + - name: set up JDK 17 + uses: https://github.com/actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + - name: 'Verify Formatting' + run: bash -ex ./.ci/scripts/format/script.sh + build-linux: + name: 'test build' + needs: format + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - type: clang + image: linux-fresh + - type: linux + image: linux-fresh + - type: windows + image: linux-mingw + container: + image: fijxu/build-environments:${{ matrix.image }} + options: -u 1001 + steps: + - uses: https://code.forgejo.org/actions/checkout@v3 + with: + submodules: recursive + fetch-depth: 0 + - name: Set up cache + uses: https://code.forgejo.org/actions/cache@v3 + id: ccache-restore + with: + path: ~/.ccache + key: ${{ runner.os }}-${{ matrix.type }}-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-${{ matrix.type }}- + - name: Create ccache directory + if: steps.ccache-restore.outputs.cache-hit != 'true' + run: mkdir -p ~/.ccache + - name: Build + run: ./.ci/scripts/${{ matrix.type }}/docker.sh + env: + ENABLE_COMPATIBILITY_REPORTING: "ON" + - name: Pack + run: ./.ci/scripts/${{ matrix.type }}/upload.sh + env: + NO_SOURCE_PACK: "YES" + - name: Upload + uses: https://code.forgejo.org/actions/upload-artifact@v3 + with: + name: ${{ matrix.type }} + path: artifacts/ + # build-mac: + # name: 'test build (macos)' + # needs: format + # runs-on: macos-14 + # steps: + # - uses: https://code.forgejo.org/actions/checkout@v3 + # with: + # submodules: recursive + # fetch-depth: 0 + # - name: Install dependencies + # run: | + # brew install autoconf automake boost ccache ffmpeg fmt glslang hidapi libtool libusb lz4 ninja nlohmann-json openssl pkg-config qt@5 sdl2 speexdsp zlib zlib zstd + # - name: Build + # run: | + # mkdir build + # cd build + # export Qt5_DIR="$(brew --prefix qt@5)/lib/cmake" + # cmake .. -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSUYU_USE_BUNDLED_VCPKG=OFF -DSUYU_TESTS=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_LIBUSB=OFF + # ninja + # build-msvc: + # name: 'test build (windows, msvc)' + # needs: format + # runs-on: windows-2022 + # steps: + # - uses: https://code.forgejo.org/actions/checkout@v3 + # with: + # submodules: recursive + # fetch-depth: 0 + # - name: Set up cache + # uses: https://code.forgejo.org/actions/cache@v3 + # with: + # path: ~/.buildcache + # key: ${{ runner.os }}-msvc-${{ github.sha }} + # restore-keys: | + # ${{ runner.os }}-msvc- + # - name: Install dependencies + # shell: pwsh + # run: | + # $ErrorActionPreference = "Stop" + # $BuildCacheVer = "v0.28.4" + # $File = "buildcache-windows.zip" + # $Uri = "https://github.com/mbitsnbites/buildcache/releases/download/$BuildCacheVer/$File" + # $WebClient = New-Object System.Net.WebClient + # $WebClient.DownloadFile($Uri, $File) + # 7z x $File + # $CurrentDir = Convert-Path . + # echo "$CurrentDir/buildcache/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + # - name: Install Vulkan SDK + # shell: pwsh + # run: .\.ci\scripts\windows\install-vulkan-sdk.ps1 + # - name: Set up MSVC + # uses: https://github.com/ilammy/msvc-dev-cmd@v1 + # - name: Configure + # env: + # CC: cl.exe + # CXX: cl.exe + # run: | + # glslangValidator --version + # mkdir build + # cmake . -B build -GNinja -DCMAKE_TOOLCHAIN_FILE="CMakeModules/MSVCCache.cmake" -DUSE_CCACHE=ON -DSUYU_USE_BUNDLED_QT=1 -DSUYU_USE_BUNDLED_SDL2=1 -DSUYU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DSUYU_ENABLE_COMPATIBILITY_REPORTING=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DGIT_BRANCH=pr-verify -DSUYU_CRASH_DUMPS=ON + # - name: Build + # run: cmake --build build + # - name: Cache Summary + # run: buildcache -s + # - name: Pack + # shell: pwsh + # run: .\.ci\scripts\windows\upload.ps1 + # - name: Upload + # uses: https://code.forgejo.org/actions/upload-artifact@v3 + # with: + # name: msvc + # path: artifacts/ + # - name: Upload EXE + # uses: https://code.forgejo.org/actions/upload-artifact@v3 + # with: + # name: ${{ env.INDIVIDUAL_EXE }} + # path: ${{ env.INDIVIDUAL_EXE }} + android: + runs-on: ubuntu-latest + needs: format + steps: + - uses: https://code.forgejo.org/actions/checkout@v3 + with: + submodules: recursive + fetch-depth: 0 + - name: set up JDK 17 + uses: https://github.com/actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + - name: Set up cache + uses: https://code.forgejo.org/actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + ~/.ccache + key: ${{ runner.os }}-android-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-android- + - name: Query tag name + uses: https://github.com/olegtarasov/get-tag@v2.1.2 + id: tagName + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get install -y ccache apksigner glslang-dev glslang-tools + - name: Build + run: ./.ci/scripts/android/build.sh + - name: Copy and sign artifacts + env: + ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }} + ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }} + ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }} + run: ./.ci/scripts/android/upload.sh + - name: Upload + uses: https://code.forgejo.org/actions/upload-artifact@v3 + with: + name: android + path: artifacts/ From 03a342bcc439b2dfc1f7369aa86b6790c5bd2327 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 18:57:56 -0300 Subject: [PATCH 13/16] erm --- .forgejo/workflows/verify.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/verify.yml b/.forgejo/workflows/verify.yml index 7d1651d5e4..9f9fe55991 100644 --- a/.forgejo/workflows/verify.yml +++ b/.forgejo/workflows/verify.yml @@ -8,7 +8,9 @@ name: 'suyu verify' on: pull_request: - branches: [ "dev" ] + branches: [ "forgejo-ci-testing" ] + push: + branches: [ "forgejo-ci-testing" ] env: PR_NUMBER: pr${{ github.event.number }} @@ -16,6 +18,8 @@ jobs: format: name: 'verify format' runs-on: ubuntu-latest + container: + image: fijxu/build-environments:linux-clang-format steps: - uses: https://code.forgejo.org/actions/checkout@v3 with: @@ -26,6 +30,7 @@ jobs: java-version: '17' distribution: 'temurin' - name: 'Verify Formatting' + container: run: bash -ex ./.ci/scripts/format/script.sh build-linux: name: 'test build' @@ -193,3 +198,4 @@ jobs: with: name: android path: artifacts/ + From 35ca581b6cc3113014d48a4cb05a5e77d6e95d73 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 19:47:28 -0300 Subject: [PATCH 14/16] Why do even need java? --- .forgejo/workflows/verify.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/verify.yml b/.forgejo/workflows/verify.yml index 9f9fe55991..018eb152c0 100644 --- a/.forgejo/workflows/verify.yml +++ b/.forgejo/workflows/verify.yml @@ -16,7 +16,7 @@ env: jobs: format: - name: 'verify format' + name: 'Verify Format' runs-on: ubuntu-latest container: image: fijxu/build-environments:linux-clang-format @@ -24,13 +24,12 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v3 with: submodules: false - - name: set up JDK 17 - uses: https://github.com/actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' + # - name: set up JDK 17 + # uses: https://github.com/actions/setup-java@v3 + # with: + # java-version: '17' + # distribution: 'temurin' - name: 'Verify Formatting' - container: run: bash -ex ./.ci/scripts/format/script.sh build-linux: name: 'test build' From d0a1c7d9d7fc894cdb669dacd3183115f63da3bf Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 21:27:34 -0300 Subject: [PATCH 15/16] 123456789 --- .forgejo/workflows/verify.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/verify.yml b/.forgejo/workflows/verify.yml index 018eb152c0..457064f50c 100644 --- a/.forgejo/workflows/verify.yml +++ b/.forgejo/workflows/verify.yml @@ -57,13 +57,13 @@ jobs: uses: https://code.forgejo.org/actions/cache@v3 id: ccache-restore with: - path: ~/.ccache + path: .ccache key: ${{ runner.os }}-${{ matrix.type }}-${{ github.sha }} restore-keys: | ${{ runner.os }}-${{ matrix.type }}- - name: Create ccache directory if: steps.ccache-restore.outputs.cache-hit != 'true' - run: mkdir -p ~/.ccache + run: mkdir -p .ccache - name: Build run: ./.ci/scripts/${{ matrix.type }}/docker.sh env: @@ -173,7 +173,7 @@ jobs: path: | ~/.gradle/caches ~/.gradle/wrapper - ~/.ccache + .ccache key: ${{ runner.os }}-android-${{ github.sha }} restore-keys: | ${{ runner.os }}-android- From b0e79a2ef1be850464d3bed1e8808a739b711f21 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 21:39:41 -0300 Subject: [PATCH 16/16] 12345678910000000000000 --- .forgejo/workflows/verify.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/verify.yml b/.forgejo/workflows/verify.yml index 457064f50c..7e1123bbe7 100644 --- a/.forgejo/workflows/verify.yml +++ b/.forgejo/workflows/verify.yml @@ -13,6 +13,8 @@ on: branches: [ "forgejo-ci-testing" ] env: PR_NUMBER: pr${{ github.event.number }} + CCACHE_DIR: '.ccache' + jobs: format: