From e509698a9a303fd305964fdc7c9fba10586c289b Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 22:41:59 -0300 Subject: [PATCH] ci: Linux builds ready to use. --- .forgejo/workflows/ci.yml | 3 +-- .forgejo/workflows/codespell.yml | 9 +++++++- .forgejo/workflows/verify.yml | 22 ++++++++++++-------- README.md | 4 ++-- src/video_core/vulkan_common/vulkan_device.h | 2 +- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 6be69600d9..143ad8982e 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -8,13 +8,12 @@ name: suyu-ci on: push: - branches: [ "*" ] + branches: [ "dev" ] tags: [ "*" ] pull_request: branches: [ "dev" ] jobs: -# We don't have transifex for now. # transifex: # runs-on: ubuntu-latest # container: fijxu/build-environments:linux-transifex diff --git a/.forgejo/workflows/codespell.yml b/.forgejo/workflows/codespell.yml index 76fb7ef48c..bf6d35d1e8 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: @@ -20,3 +26,4 @@ jobs: with: persist-credentials: false - uses: https://github.com/codespell-project/actions-codespell@master + diff --git a/.forgejo/workflows/verify.yml b/.forgejo/workflows/verify.yml index 26f19586e8..e379168033 100644 --- a/.forgejo/workflows/verify.yml +++ b/.forgejo/workflows/verify.yml @@ -13,20 +13,24 @@ on: branches: [ "dev" ] env: PR_NUMBER: pr${{ github.event.number }} + CCACHE_DIR: '.ccache' + jobs: format: - name: 'verify 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: 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' run: bash -ex ./.ci/scripts/format/script.sh build-linux: @@ -55,13 +59,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: @@ -171,7 +175,7 @@ jobs: path: | ~/.gradle/caches ~/.gradle/wrapper - ~/.ccache + .ccache key: ${{ runner.os }}-android-${{ github.sha }} restore-keys: | ${{ runner.os }}-android- diff --git a/README.md b/README.md index 1c3c5f5803..0f6657592a 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. @@ -74,4 +74,4 @@ If you have any questions, don't hesitate to ask us on [Discord](https://discord ## License -suyu is licensed under the free and open-source GPL v3 license. +suyu is licensed under the free and open-source GPL-3.0-or-later license. 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; }