diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml index 1f5b89ee6..ddb4cfe74 100644 --- a/.github/workflows/node-ci.yml +++ b/.github/workflows/node-ci.yml @@ -265,15 +265,13 @@ jobs: cmake --build build - name: Run render tests on macOS + id: render_tests if: runner.os == 'macOS' - # A few are failing - # https://github.com/maplibre/maplibre-native/issues/2741 - # Almost all are failing on Intel GitHub runners (but only on CI) - continue-on-error: true + continue-on-error: ${{ runner.arch == 'X64' }} run: ./build/mbgl-render-test-runner --manifestPath metrics/macos-xcode11-release-style.json - name: Upload render test artifacts (MacOS) - if: runner.os == 'MacOS' + if: runner.os == 'MacOS' && steps.render_tests.outcome == 'failure' uses: actions/upload-artifact@v4 with: name: render-query-test-results_${{ runner.os }}_${{ matrix.arch }} diff --git a/metrics/expectations/platform-macos/render-tests/combinations/heatmap-translucent--fill-translucent/expected.png b/metrics/expectations/platform-macos/render-tests/combinations/heatmap-translucent--fill-translucent/expected.png new file mode 100644 index 000000000..49da3a57b Binary files /dev/null and b/metrics/expectations/platform-macos/render-tests/combinations/heatmap-translucent--fill-translucent/expected.png differ diff --git a/metrics/expectations/platform-macos/render-tests/combinations/hillshade-translucent--fill-opaque/expected.png b/metrics/expectations/platform-macos/render-tests/combinations/hillshade-translucent--fill-opaque/expected.png new file mode 100644 index 000000000..6f559a8cd Binary files /dev/null and b/metrics/expectations/platform-macos/render-tests/combinations/hillshade-translucent--fill-opaque/expected.png differ diff --git a/metrics/expectations/platform-macos/render-tests/combinations/raster-translucent--fill-translucent/expected.png b/metrics/expectations/platform-macos/render-tests/combinations/raster-translucent--fill-translucent/expected.png new file mode 100644 index 000000000..e96a626f0 Binary files /dev/null and b/metrics/expectations/platform-macos/render-tests/combinations/raster-translucent--fill-translucent/expected.png differ diff --git a/metrics/expectations/platform-macos/render-tests/fill-extrusion-base/default/expected.png b/metrics/expectations/platform-macos/render-tests/fill-extrusion-base/default/expected.png new file mode 100644 index 000000000..f2cf3938b Binary files /dev/null and b/metrics/expectations/platform-macos/render-tests/fill-extrusion-base/default/expected.png differ diff --git a/metrics/expectations/platform-macos/render-tests/fill-extrusion-base/function/expected.png b/metrics/expectations/platform-macos/render-tests/fill-extrusion-base/function/expected.png new file mode 100644 index 000000000..c073e10f8 Binary files /dev/null and b/metrics/expectations/platform-macos/render-tests/fill-extrusion-base/function/expected.png differ diff --git a/metrics/expectations/platform-macos/render-tests/fill-extrusion-base/literal/expected.png b/metrics/expectations/platform-macos/render-tests/fill-extrusion-base/literal/expected.png new file mode 100644 index 000000000..cf119ed03 Binary files /dev/null and b/metrics/expectations/platform-macos/render-tests/fill-extrusion-base/literal/expected.png differ diff --git a/metrics/expectations/platform-macos/render-tests/fill-extrusion-base/negative/expected.png b/metrics/expectations/platform-macos/render-tests/fill-extrusion-base/negative/expected.png new file mode 100644 index 000000000..ac80278be Binary files /dev/null and b/metrics/expectations/platform-macos/render-tests/fill-extrusion-base/negative/expected.png differ diff --git a/metrics/expectations/platform-macos/render-tests/fill-extrusion-translate-anchor/map/expected.png b/metrics/expectations/platform-macos/render-tests/fill-extrusion-translate-anchor/map/expected.png new file mode 100644 index 000000000..271228f94 Binary files /dev/null and b/metrics/expectations/platform-macos/render-tests/fill-extrusion-translate-anchor/map/expected.png differ diff --git a/metrics/expectations/platform-macos/render-tests/fill-extrusion-translate-anchor/viewport/expected.png b/metrics/expectations/platform-macos/render-tests/fill-extrusion-translate-anchor/viewport/expected.png new file mode 100644 index 000000000..a2f49fd73 Binary files /dev/null and b/metrics/expectations/platform-macos/render-tests/fill-extrusion-translate-anchor/viewport/expected.png differ diff --git a/metrics/expectations/platform-macos/render-tests/sprites/2x-screen-2x-pattern/expected.png b/metrics/expectations/platform-macos/render-tests/sprites/2x-screen-2x-pattern/expected.png new file mode 100644 index 000000000..4760dfa5d Binary files /dev/null and b/metrics/expectations/platform-macos/render-tests/sprites/2x-screen-2x-pattern/expected.png differ diff --git a/metrics/expectations/platform-macos/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/expected.png b/metrics/expectations/platform-macos/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/expected.png new file mode 100644 index 000000000..371da5b9e Binary files /dev/null and b/metrics/expectations/platform-macos/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/expected.png differ diff --git a/metrics/expectations/platform-macos/render-tests/within/filter-with-inlined-geojson/expected.png b/metrics/expectations/platform-macos/render-tests/within/filter-with-inlined-geojson/expected.png new file mode 100644 index 000000000..0c98d60bc Binary files /dev/null and b/metrics/expectations/platform-macos/render-tests/within/filter-with-inlined-geojson/expected.png differ diff --git a/metrics/expectations/platform-macos/render-tests/within/paint-line/expected.png b/metrics/expectations/platform-macos/render-tests/within/paint-line/expected.png new file mode 100644 index 000000000..aa4797f77 Binary files /dev/null and b/metrics/expectations/platform-macos/render-tests/within/paint-line/expected.png differ diff --git a/metrics/ignores/platform-macos.json b/metrics/ignores/platform-macos.json index 4dd90d8bd..ea79e2f62 100644 --- a/metrics/ignores/platform-macos.json +++ b/metrics/ignores/platform-macos.json @@ -1,5 +1,10 @@ { "render-tests/icon-image/icon-sdf-non-sdf-one-layer": "Failing on GitHub runner for unknown reason https://github.com/maplibre/maplibre-native/issues/377", "render-tests/regressions/mapbox-gl-js#5642": "Failing with mbgl-render-test", - "render-tests/regressions/mapbox-gl-js#7066": "Failing with mbgl-render-test" + "render-tests/regressions/mapbox-gl-js#7066": "Failing with mbgl-render-test", + "render-tests/text-field/formatted-images": "Needs to be investigated and fixed.", + "render-tests/symbol-visibility/visible": "Needs to be investigated and fixed.", + "render-tests/fill-outline-color/zoom-and-property-function": "It will be fixed after triangulated lines will support data driven properties", + "render-tests/fill-outline-color/property-function": "It will be fixed after triangulated lines will support data driven properties", + "render-tests/fill-extrusion-color/function": "Layer Z Fighting: https://github.com/maplibre/maplibre-native/issues/1847" } diff --git a/metrics/macos-xcode11-release-metrics.json b/metrics/macos-xcode11-release-metrics.json index 2ca766cba..2e8f5b75f 100644 --- a/metrics/macos-xcode11-release-metrics.json +++ b/metrics/macos-xcode11-release-metrics.json @@ -2,6 +2,7 @@ "base_test_path": "tests", "cache_path": "cache-metrics.db", "expectation_paths": [ + "expectations/platform-macos" ], "ignore_paths": [ "ignores/platform-all.json", diff --git a/metrics/macos-xcode11-release-style.json b/metrics/macos-xcode11-release-style.json index 2e202e03f..960fbb3c0 100644 --- a/metrics/macos-xcode11-release-style.json +++ b/metrics/macos-xcode11-release-style.json @@ -2,6 +2,7 @@ "base_test_path": "integration", "cache_path": "cache-style.db", "expectation_paths": [ + "expectations/platform-macos" ], "ignore_paths": [ "ignores/platform-all.json",