Fix upload action breaking changes (#3533)

* Fix upload action breaking changes * Avoid name changes * Update test-all.yml * Update test-all.yml * Update style.json
maplibre · Jan 3, 2024 · c9fa1c5 · c9fa1c5
1 parent 39003c9
commit c9fa1c5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 49 deletions.
diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml
@@ -34,28 +34,18 @@ jobs:
 
   unit-tests:
     name: Unit tests and Coverage
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     timeout-minutes: 40
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
       - name: Start display server
-        if: runner.os == 'Linux'
         run: nohup Xvfb &
           echo "DISPLAY=:0" >> $GITHUB_ENV
       - run: npm ci
       - run: npm run jest-ci -- --coverage --coverageReporters json text html-spa --selectProjects unit
-      - name: Upload unit test coverage
-        if: success() || failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: unit-test-coverage
-          path: ${{ github.workspace }}/coverage
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3
         with:
@@ -79,54 +69,19 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: success()
         with:
-          name: build-dist
+          name: build-dist-${{ matrix.os }}
           path: dist/maplibre-gl.js
       - run: npm run test-integration
         if: success() || failure()
 
   render-tests-ubuntu:
-    name: Render tests
-    env:
-      SPLIT_COUNT: 2
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        split: [0, 1]
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 120
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-      - name: install CJK fonts for local ideographs render tests
-        run: sudo apt install fonts-noto-cjk
-      - run: npm ci
-      - name: Start display server
-        if: runner.os == 'Linux'
-        run: nohup Xvfb &
-          echo "DISPLAY=:0" >> $GITHUB_ENV
-      - run: npm run build-prod
-      - run: npm run test-render
-        env:
-          CURRENT_SPLIT_INDEX: ${{ matrix.split }}
-        if: success() || failure()
-      - name: Upload render test failure
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: render-test-report-${{ matrix.os }}-${{ matrix.split }}
-          path: ${{ github.workspace }}/test/integration/render/results.html
-
-  render-tests-windows:
     name: Render tests
     env:
       SPLIT_COUNT: 3
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest]
+        os: [ubuntu-latest, windows-latest]
         split: [0, 1, 2]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 120
@@ -135,6 +90,9 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
+      - name: install CJK fonts for local ideographs render tests
+        if: runner.os == 'Linux'
+        run: sudo apt install fonts-noto-cjk
       - run: npm ci
       - name: Start display server
         if: runner.os == 'Linux'

diff --git a/test/integration/render/tests/text-variable-anchor-offset/pitched/style.json b/test/integration/render/tests/text-variable-anchor-offset/pitched/style.json
@@ -3,7 +3,7 @@
   "metadata": {
     "test": {
       "height": 256,
-      "operations": [["idle"], ["wait", 100]]
+      "operations": [["idle"], ["wait", 300]]
     }
   },
   "center": [