Merge branch 'master' into unity2021

Author: nowsprinting

.github/dependabot.yml

@@ -3,4 +3,4 @@ updates:
   - package-ecosystem: github-actions
     directory: /
     schedule:
-      interval: daily
+      interval: weekly

.github/workflows/actionlint.yml

@@ -17,6 +17,7 @@ on:
 jobs:
   actionlint:
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     permissions:
       contents: read
       actions: read

.github/workflows/metacheck.yml

@@ -13,6 +13,7 @@ on:
 jobs:
   meta-check:
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     permissions:
       contents: read
       actions: read
@@ -23,7 +24,7 @@ jobs:
           submodules: false
           lfs: false
 
-      - uses: DeNA/unity-meta-check@v3
+      - uses: DeNA/unity-meta-check@v4
 
       - uses: 8398a7/action-slack@v3
         with:

.github/workflows/test-integration.yml

@@ -26,6 +26,7 @@ jobs:
   test:
     if: github.event.pull_request.head.repo.fork == false # Skip on public fork, because can not read secrets.
     runs-on: ${{ github.event.inputs.runner }}
+    timeout-minutes: 15
     permissions:
       contents: read
       checks: write
@@ -45,12 +46,14 @@ jobs:
           submodules: false
           lfs: false
 
-      - uses: buildjet/cache@v3
+      - uses: buildjet/cache@v4
         with:
           path: Library
-          key: Library-${{ matrix.unityVersion }}
+          key: Library-linux-${{ matrix.unityVersion }}-${{ github.ref }}
           restore-keys: |
-            Library-
+            Library-linux-${{ matrix.unityVersion }}
+            Library-linux
+            Library
 
       - name: Set coverage assembly filters
         run: |
@@ -90,11 +93,12 @@ jobs:
     needs: test
     if: github.event.pull_request.head.repo.fork == false # Skip on public fork, because can not read secrets.
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     permissions:
       actions: read
 
     steps:
-      - uses: Gamesight/slack-workflow-status@v1.2.0
+      - uses: Gamesight/slack-workflow-status@v1.3.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/test.yml

@@ -26,6 +26,7 @@ jobs:
   test:
     if: github.event.pull_request.head.repo.fork == false # Skip on public fork, because can not read secrets.
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     permissions:
       contents: read
       checks: write
@@ -52,9 +53,11 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: Library
-          key: Library-${{ matrix.unityVersion }}
+          key: Library-linux-${{ matrix.unityVersion }}-${{ github.ref }}
           restore-keys: |
-            Library-
+            Library-linux-${{ matrix.unityVersion }}
+            Library-linux
+            Library
 
       - name: Set coverage assembly filters
         run: |
@@ -102,11 +105,12 @@ jobs:
     needs: test
     if: github.event.pull_request.head.repo.fork == false # Skip on public fork, because can not read secrets.
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     permissions:
       actions: read
 
     steps:
-      - uses: Gamesight/slack-workflow-status@v1.2.0
+      - uses: Gamesight/slack-workflow-status@v1.3.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}

.idea/.idea.UnityTestExamples/.idea/.gitignore

@@ -3,16 +3,21 @@ coverage:
   if: true
   paths:
     - ./Logs/Report/lcov.info # Warning: This path is replace by regex in test.yml
+
 codeToTestRatio:
   code:
     - 'Assets/**/*.cs'
     - 'Packages/**/*.cs'
-    - '!**/Tests/**/*.cs'
+    - 'LocalPackages/**/*.cs'
+    - '!**/Tests/**'
   test:
     - '**/Tests/**/*.cs'
+    - '!Library/**'
+
 testExecutionTime:
   if: true
 diff:
+
   datastores:
     - artifact://${GITHUB_REPOSITORY}
 

.octocov.yml

@@ -49,7 +49,7 @@ endif
 
 define base_arguments
 -projectPath $(PROJECT_HOME) \
--logFile $(LOG_DIR)/test_$(TEST_PLATFORM).log
+-logFile $(LOG_DIR)/$(TEST_PLATFORM).log
 endef
 
 define test_arguments
@@ -62,7 +62,9 @@ $(TEST_CATEGORY) \
 $(TEST_FILTER) \
 $(ASSEMBLY_NAMES) \
 -testPlatform $(TEST_PLATFORM) \
--testResults $(LOG_DIR)/test_$(TEST_PLATFORM)_results.xml
+-testResults $(LOG_DIR)/$(TEST_PLATFORM)-results.xml \
+-testHelperJUnitResults $(LOG_DIR)/$(TEST_PLATFORM)-junit-results.xml \
+-testHelperScreenshotDirectory $(LOG_DIR)/Screenshots
 endef
 
 define test

Makefile

@@ -10,9 +10,8 @@
     "com.unity.collab-proxy": "1.14.18",
     "com.unity.ide.rider": "3.0.26",
     "com.unity.ide.visualstudio": "2.0.22",
-    "com.unity.ide.vscode": "1.2.5",
     "com.unity.inputsystem": "1.7.0",
-    "com.unity.test-framework": "1.4.3",
+    "com.unity.test-framework": "1.4.5",
     "com.unity.testframework.graphics": "7.17.0-exp.1",
     "com.unity.testtools.codecoverage": "1.2.4",
     "com.unity.textmeshpro": "2.1.6",

Packages/manifest.json

@@ -116,13 +116,6 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.ide.vscode": {
-      "version": "1.2.5",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.inputsystem": {
       "version": "1.7.0",
       "depth": 0,
@@ -154,7 +147,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.4.3",
+      "version": "1.4.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {