Quellcode durchsuchen

ci: Linux builds ready to use.

Fijxu vor 2 Jahren
Ursprung
Commit
e509698a9a

+ 1 - 2
.forgejo/workflows/ci.yml

@@ -8,13 +8,12 @@ name: suyu-ci
 
 
 on:
 on:
   push:
   push:
-    branches: [ "*" ]
+    branches: [ "dev" ]
     tags: [ "*" ]
     tags: [ "*" ]
   pull_request:
   pull_request:
     branches: [ "dev" ]
     branches: [ "dev" ]
 
 
 jobs:
 jobs:
-# We don't have transifex for now.
 #   transifex:
 #   transifex:
 #     runs-on: ubuntu-latest
 #     runs-on: ubuntu-latest
 #     container: fijxu/build-environments:linux-transifex
 #     container: fijxu/build-environments:linux-transifex

+ 8 - 1
.forgejo/workflows/codespell.yml

@@ -9,7 +9,13 @@
 # Actions Documentation: https://forgejo.org/docs/next/user/actions/#list-of-tasks-in-a-repository
 # Actions Documentation: https://forgejo.org/docs/next/user/actions/#list-of-tasks-in-a-repository
 
 
 name: codespell
 name: codespell
-on: pull_request
+on:
+  push:
+    branches: [ "*" ]
+    tags: [ "*" ]
+  pull_request:
+    branches: [ "*" ]
+
 permissions: {}
 permissions: {}
 jobs:
 jobs:
   codespell:
   codespell:
@@ -20,3 +26,4 @@ jobs:
         with:
         with:
           persist-credentials: false
           persist-credentials: false
       - uses: https://github.com/codespell-project/actions-codespell@master
       - uses: https://github.com/codespell-project/actions-codespell@master
+

+ 13 - 9
.forgejo/workflows/verify.yml

@@ -13,20 +13,24 @@ on:
     branches: [ "dev" ]
     branches: [ "dev" ]
 env:
 env:
   PR_NUMBER: pr${{ github.event.number }}
   PR_NUMBER: pr${{ github.event.number }}
+  CCACHE_DIR: '.ccache'
+
 
 
 jobs:
 jobs:
   format:
   format:
-    name: 'verify format'
+    name: 'Verify Format'
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest
+    container:
+      image: fijxu/build-environments:linux-clang-format
     steps:
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v3
       - uses: https://code.forgejo.org/actions/checkout@v3
         with:
         with:
           submodules: false
           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'
       - name: 'Verify Formatting'
         run: bash -ex ./.ci/scripts/format/script.sh
         run: bash -ex ./.ci/scripts/format/script.sh
   build-linux:
   build-linux:
@@ -55,13 +59,13 @@ jobs:
         uses: https://code.forgejo.org/actions/cache@v3
         uses: https://code.forgejo.org/actions/cache@v3
         id: ccache-restore
         id: ccache-restore
         with:
         with:
-          path: ~/.ccache
+          path: .ccache
           key: ${{ runner.os }}-${{ matrix.type }}-${{ github.sha }}
           key: ${{ runner.os }}-${{ matrix.type }}-${{ github.sha }}
           restore-keys: |
           restore-keys: |
             ${{ runner.os }}-${{ matrix.type }}-
             ${{ runner.os }}-${{ matrix.type }}-
       - name: Create ccache directory
       - name: Create ccache directory
         if: steps.ccache-restore.outputs.cache-hit != 'true'
         if: steps.ccache-restore.outputs.cache-hit != 'true'
-        run: mkdir -p ~/.ccache
+        run: mkdir -p .ccache
       - name: Build
       - name: Build
         run: ./.ci/scripts/${{ matrix.type }}/docker.sh
         run: ./.ci/scripts/${{ matrix.type }}/docker.sh
         env:
         env:
@@ -171,7 +175,7 @@ jobs:
           path: |
           path: |
             ~/.gradle/caches
             ~/.gradle/caches
             ~/.gradle/wrapper
             ~/.gradle/wrapper
-            ~/.ccache
+            .ccache
           key: ${{ runner.os }}-android-${{ github.sha }}
           key: ${{ runner.os }}-android-${{ github.sha }}
           restore-keys: |
           restore-keys: |
             ${{ runner.os }}-android-
             ${{ runner.os }}-android-

+ 2 - 2
README.md

@@ -1,6 +1,6 @@
 <!--
 <!--
 SPDX-FileCopyrightText: 2024 suyu emulator project
 SPDX-FileCopyrightText: 2024 suyu emulator project
-SPDX-License-Identifier: GPL v3
+SPDX-License-Identifier: GPL-3.0-or-later
 -->
 -->
 
 
 **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.
 **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
 ## 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.

+ 1 - 1
src/video_core/vulkan_common/vulkan_device.h

@@ -702,7 +702,7 @@ public:
         return properties.driver.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY;
         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 {
     bool IsMoltenVK() const noexcept {
         return properties.driver.driverID == VK_DRIVER_ID_MOLTENVK;
         return properties.driver.driverID == VK_DRIVER_ID_MOLTENVK;
     }
     }