Merge branch 'main' into 1.20

naninovel · Feb 12, 2024 · 06cbf19 · 06cbf19
2 parents 44c42ac + a0164ed
commit 06cbf19
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -5,8 +5,6 @@ on:
     branches: [ main ]
   pull_request:
     branches: [ main ]
-  schedule:
-    - cron: '36 7 * * 0'
 
 jobs:
   analyze:
@@ -21,20 +19,22 @@ jobs:
       matrix:
         language: [ 'csharp', 'javascript' ]
     steps:
-      - name: checkout
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: setup dotnet
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
       - name: initialize codeql
         uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
       - name: build
         run: |
-          dotnet nuget add source https://nuget.pkg.github.com/Naninovel/index.json -n github --username ${{ secrets.GH_USER }} --password ${{ secrets.GH_TOKEN }} --store-password-in-clear-text
-          dotnet publish backend/Naninovel.Language.WASM/Naninovel.Language.WASM.csproj
+          dotnet workload restore backend/Naninovel.Language.sln
+          dotnet publish backend
           npm ci
           npm run build
       - name: analyze

diff --git a/.github/workflows/cover.yml b/.github/workflows/cover.yml
@@ -1,4 +1,4 @@
-name: cover
+name: test
 
 on:
   push:
@@ -10,20 +10,23 @@ jobs:
   cover:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: setup dotnet
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
       - name: cover
         run: |
-          dotnet nuget add source https://nuget.pkg.github.com/Naninovel/index.json -n github --username ${{ secrets.GH_USER }} --password ${{ secrets.GH_TOKEN }} --store-password-in-clear-text
-          dotnet test backend/Naninovel.Language.sln /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
-          dotnet publish backend/Naninovel.Language.WASM/Naninovel.Language.WASM.csproj
+          dotnet workload restore backend/Naninovel.Language.sln
+          dotnet test backend /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
+          dotnet publish backend
           npm ci
           npm run build
           npm run cover
-      - name: upload coverage reports to Codecov
+      - name: upload coverage report
         uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true