Bladeren bron

Merge pull request #19143 from munrocket/ci

CI: fine tuning
munrocket 5 jaren geleden
bovenliggende
commit
349aec9e34
3 gewijzigde bestanden met toevoegingen van 6 en 18 verwijderingen
  1. 4 16
      .github/workflows/ci.yml
  2. BIN
      examples/screenshots/webgl2_multisampled_renderbuffers.png
  3. 2 2
      test/e2e/puppeteer.js

+ 4 - 16
.github/workflows/ci.yml

@@ -27,10 +27,7 @@ jobs:
         with:
           path: ~/.npm
           key: ${{ runner.os }}-ci-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-ci-${{ env.cache-name }}-
-            ${{ runner.os }}-ci-
-            ${{ runner.os }}-
+          restore-keys: ${{ runner.os }}-ci-${{ env.cache-name }}-
       - name: Install packages
         run: npm ci
 
@@ -54,10 +51,7 @@ jobs:
         with:
           path: ~/.npm
           key: ${{ runner.os }}-ci-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-ci-${{ env.cache-name }}-
-            ${{ runner.os }}-ci-
-            ${{ runner.os }}-
+          restore-keys: ${{ runner.os }}-ci-${{ env.cache-name }}-
       - name: Install packages
         run: npm ci
 
@@ -87,10 +81,7 @@ jobs:
         with:
           path: ~/.npm
           key: ${{ runner.os }}-ci-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-ci-${{ env.cache-name }}-
-            ${{ runner.os }}-ci-
-            ${{ runner.os }}-
+          restore-keys: ${{ runner.os }}-ci-${{ env.cache-name }}-
       - name: Install packages
         run: npm ci && sudo apt-get install xvfb && npm run build
 
@@ -114,10 +105,7 @@ jobs:
         with:
           path: ~/.npm
           key: ${{ runner.os }}-ci-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-ci-${{ env.cache-name }}-
-            ${{ runner.os }}-ci-
-            ${{ runner.os }}-
+          restore-keys: ${{ runner.os }}-ci-${{ env.cache-name }}-
       - name: Install packages
         run: npm ci
 

BIN
examples/screenshots/webgl2_multisampled_renderbuffers.png


+ 2 - 2
test/e2e/puppeteer.js

@@ -21,10 +21,10 @@ const exceptionList = [
 	'webgl_kinect', // same here
 	'webaudio_visualizer', // audio can't be analyzed without proper audio hook
 	'webgl_loader_texture_pvrtc', // not supported in CI, useless
-	'webgl_materials_envmaps_parallax',
+	'webgl_materials_envmaps_parallax', // empty for some reason
 	'webgl_test_memory2', // gives fatal error in puppeteer
+	'webgl_tiled_forward', // exception for Github Actions
 	'webgl_worker_offscreencanvas', // in a worker, not robust
-	'webgl2_multisampled_renderbuffers'
 
 ].concat( ( process.platform === "win32" ) ? [