diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml index 173215be76..983e8f7a19 100644 --- a/.github/workflows/test-all.yml +++ b/.github/workflows/test-all.yml @@ -34,10 +34,7 @@ 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 @@ -45,17 +42,10 @@ jobs: 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 index eed15cb0af..912b82977d 100644 --- 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": [