Fix Drawable / Legacy renderer matrix Linux CI

.github/workflows/ios-ci.yml

@@ -120,14 +120,14 @@ jobs:
       # size test
 
       - name: Build app for size test & output size
-        if: ${{ matrix.renderer }} == "legacy"
+        if: matrix.renderer == 'legacy'
         working-directory: ./
         run: | 
           bazel build --compilation_mode=opt //platform/ios:size --//:maplibre_platform=ios
           cp "$(bazel cquery --compilation_mode=opt --output=files //platform/ios:size --//:maplibre_platform=ios)" ./size
 
       - name: Upload size test result
-        if: ${{ matrix.renderer }} == "legacy"
+        if: matrix.renderer == 'legacy'
         uses: actions/upload-artifact@v3
         with:
           if-no-files-found: error
@@ -138,7 +138,7 @@ jobs:
       # render test
 
       - name: Build RenderTest .ipa and .xctest for AWS Device Farm
-        if: ${{ matrix.renderer }} == "legacy"
+        if: matrix.renderer == 'legacy'
         run: |
           set -e
           bazel run //platform/ios:xcodeproj
@@ -155,7 +155,7 @@ jobs:
           echo render_test_artifacts_dir="$render_test_app_dir" >> "$GITHUB_ENV"
 
       - uses: actions/upload-artifact@v3
-        if: ${{ matrix.renderer }} == "legacy"
+        if: matrix.renderer == 'legacy'
         with:
           name: ios-render-test
           retention-days: 3
@@ -167,7 +167,7 @@ jobs:
       # C++ unit tests
 
       - name: Build CppUnitTests .ipa and .xctest for AWS Device Farm
-        if: ${{ matrix.renderer }} == "legacy"
+        if: matrix.renderer == 'legacy'
         run: |
           set -e
           bazel run //platform/ios:xcodeproj
@@ -184,7 +184,7 @@ jobs:
           echo ios_cpp_test_artifacts_dir="$ios_cpp_test_app_dir" >> "$GITHUB_ENV"
 
       - uses: actions/upload-artifact@v3
-        if: ${{ matrix.renderer }} == "legacy"
+        if: matrix.renderer == 'legacy'
         with:
           name: ios-cpp-unit-tests
           retention-days: 3

.github/workflows/linux-ci.yml

@@ -39,11 +39,11 @@ jobs:
             ".bazelrc",
             ".bazelversion"]
 
-  linux-build:
+  linux-build-and-test:
     if: needs.pre_job.outputs.should_skip != 'true'
     needs: pre_job
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         renderer: [legacy, drawable]
     runs-on: MapLibre_Native_Linux_16_core
@@ -77,12 +77,13 @@ jobs:
             libjpeg-dev \
             libpng-dev \
             libglfw3-dev \
-            libwebp-dev
+            libwebp-dev \
+            libopengl0
 
-      - if: ${{ matrix.renderer }} == "drawable"
+      - if: matrix.renderer == 'drawable'
         run: echo renderer_flag_cmake=-DMLN_DRAWABLE_RENDERER=ON >> "$GITHUB_ENV"
 
-      - if: ${{ matrix.renderer }} == "legacy"
+      - if: matrix.renderer == 'legacy'
         run: echo renderer_flag_cmake=-DMLN_LEGACY_RENDERER=ON >> "$GITHUB_ENV"
 
       - name: Build MapLibre Native Core
@@ -98,95 +99,20 @@ jobs:
         with:
           category: "/language:cpp"
 
-      - name: Archive mbgl-test-runner
-        uses: actions/upload-artifact@v3
-        with:
-          name: mbgl-test-runner
-          path: build/mbgl-test-runner
-          retention-days: 1
-
-      - name: Archive mbgl-render-test-runner
-        uses: actions/upload-artifact@v3
-        with:
-          name: mbgl-render-test-runner
-          path: build/mbgl-render-test-runner
-          retention-days: 1
+      # unit tests
 
-      - name: Archive mbgl-expression-test
-        uses: actions/upload-artifact@v3
-        with:
-          name: mbgl-expression-test
-          path: build/expression-test/mbgl-expression-test
-          retention-days: 1
-
-  linux-test:
-    if: needs.pre_job.outputs.should_skip != 'true'
-    needs:
-      - pre_job
-      - linux-build
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            libopengl0
-
-      - name: Download mbgl-test-runner
-        uses: actions/download-artifact@v3
-        with:
-          name: mbgl-test-runner
-
-      - run: chmod +x ./mbgl-test-runner
+      - run: chmod +x build/mbgl-test-runner
 
       - name: Run C++ tests
-        run: xvfb-run -a ./mbgl-test-runner
+        run: xvfb-run -a build/mbgl-test-runner
 
-  linux-expression-test:
-    if: needs.pre_job.outputs.should_skip != 'true'
-    needs:
-      - pre_job
-      - linux-build
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download mbgl-expression-test
-        uses: actions/download-artifact@v3
-        with:
-          name: mbgl-expression-test
-
-      - run: chmod +x ./mbgl-expression-test
-
-      - name: Run expression test
-        run: ./mbgl-expression-test
-
-  linux-render-test:
-    if: needs.pre_job.outputs.should_skip != 'true'
-    needs:
-      - pre_job
-      - linux-build
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            libopengl0
+      # render tests
 
-      - uses: actions/checkout@v4
-
-      - name: Download mbgl-render-test-runner
-        uses: actions/download-artifact@v3
-        with:
-          name: mbgl-render-test-runner
-
-      - run: chmod +x ./mbgl-render-test-runner
+      - run: chmod +x build/mbgl-render-test-runner
 
       - name: Run render test
         id: render_test
-        run: xvfb-run -a ./mbgl-render-test-runner --manifestPath=metrics/linux-gcc8-release-style.json
+        run: xvfb-run -a build/mbgl-render-test-runner --manifestPath=metrics/linux-${{ matrix.renderer }}.json
 
       - name: Upload render test result
         if: always() && steps.render_test.outcome == 'failure'
@@ -195,6 +121,13 @@ jobs:
           name: render-test-result
           path: |
             metrics/linux-gcc8-release-style.html
+
+      # expression tests
+
+      - run: chmod +x build/expression-test/mbgl-expression-test
+
+      - name: Run expression test
+        run: build/expression-test/mbgl-expression-test
 
   linux-coverage:
     runs-on: ubuntu-22.04
@@ -254,11 +187,9 @@ jobs:
     runs-on: ubuntu-22.04
     needs:
       - pre_job
-      - linux-build
-      - linux-test
-      - linux-render-test
+      - linux-build-and-test
       - linux-coverage
     steps:
       - name: Mark result as failed
-        if: needs.linux-build.result != 'success' || needs.linux-test.result != 'success' || needs.linux-render-test.result != 'success' || needs.linux-coverage.result != 'success'
+        if: needs.linux-build-and-test.result != 'success' || needs.linux-coverage.result != 'success'
         run: exit 1

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
   hooks:
     - id: buildifier
 - repo: https://github.com/Mateusz-Grzelinski/actionlint-py
-  rev: v1.6.25.9
+  rev: v1.6.26.11
   hooks:
     - id: actionlint
       additional_dependencies: [shellcheck-py]

CMakeLists.txt

@@ -57,6 +57,10 @@ add_library(
 
 set(UBSAN_BLACKLIST ${PROJECT_SOURCE_DIR}/scripts/ubsan.blacklist)
 
+if (MLN_DRAWABLE_RENDERER)
+    set(MLN_LEGACY_RENDERER OFF)
+endif()
+
 target_compile_options(
     mbgl-compiler-options
     INTERFACE

include/mbgl/gfx/vertex_attribute.hpp

@@ -239,8 +239,9 @@ class VertexAttribute {
     const gfx::UniqueVertexBufferResource& getBuffer() const { return buffer; }
     void setBuffer(gfx::UniqueVertexBufferResource&& value) { buffer = std::move(value); }
 
-protected:
     VertexAttribute& operator=(const VertexAttribute&) = delete;
+
+protected:
     VertexAttribute& operator=(VertexAttribute&& other) {
         index = other.index;
         dataType = other.dataType;
@@ -386,7 +387,7 @@ class VertexAttributeArray {
 
                         auto& attributeNameID = DataDrivenPaintProperty::AttributeNameIDs[attrIndex];
                         if (!attributeNameID) {
-                            attributeNameID = StringIndexer::get(attributePrefix + attributeName.data());
+                            attributeNameID = stringIndexer().get(attributePrefix + attributeName.data());
                         }
 
                         const auto vertexCount = binder->getVertexCount();

include/mbgl/shaders/gl/shader_group_gl.hpp

@@ -42,7 +42,7 @@ class ShaderGroupGL final : public gfx::ShaderGroup {
         additionalDefines.reserve(propertiesAsUniforms.size() * 48);
         for (const auto nameID : propertiesAsUniforms) {
             // We expect the names to be prefixed by "a_", but we need just the base here.
-            const auto prefixedAttrName = StringIndexer::get(nameID);
+            const auto prefixedAttrName = stringIndexer().get(nameID);
             const auto* prefix = prefixedAttrName.data();
             if (prefix[0] == 'a' && prefix[1] == '_') {
                 prefix += 2;

include/mbgl/util/string_indexer.hpp

@@ -15,36 +15,28 @@ using StringIdentity = std::size_t;
 
 class StringIndexer {
 public:
+    StringIndexer();
+
     StringIndexer(StringIndexer const&) = delete;
     StringIndexer(StringIndexer&&) = delete;
     void operator=(StringIndexer const&) = delete;
+    ~StringIndexer() = default;
 
-    static StringIdentity get(std::string_view);
-
-    static std::string get(const StringIdentity id);
+    StringIdentity get(std::string_view);
 
-    static void clear();
+    std::string get(const StringIdentity id);
 
-    static size_t size();
+    size_t size();
 
 protected:
-    StringIndexer();
-    ~StringIndexer() = default;
-
-    using MapType = std::unordered_map<std::string_view, StringIdentity>;
-    using VectorType = std::vector<std::size_t>;
-    using BufferType = std::vector<char>;
-
-    static StringIndexer& instance() {
-        static StringIndexer inst;
-        return inst;
-    }
-
-    MapType stringToIdentity;
-    VectorType identityToString;
-    BufferType buffer;
+    std::unordered_map<std::string_view, StringIdentity> stringToIdentity;
+    std::vector<StringIdentity> identityToString;
+    std::vector<char> buffer;
 
     std::shared_mutex sharedMutex;
 };
 
+/// StringIndexer singleton
+StringIndexer& stringIndexer();
+
 } // namespace mbgl

metrics/ignores/linux-drawable.json

@@ -0,0 +1,3 @@
+{
+  "render-tests/regressions/mapbox-gl-js#3426": "https://github.com/maplibre/maplibre-native/issues/1734"
+}

metrics/linux-drawable.json

@@ -0,0 +1,16 @@
+{
+  "base_test_path": "integration",
+  "cache_path": "cache-style.db",
+  "expectation_paths": [
+      "expectations/platform-all"
+  ],
+  "ignore_paths": [
+      "ignores/platform-all.json",
+      "ignores/platform-linux.json",
+      "ignores/linux-drawable.json"
+  ],
+  "metric_path": "linux-gcc8-release",
+  "probes": [
+      "probeNetwork"
+  ]
+}

metrics/linux-legacy.json

@@ -0,0 +1,16 @@
+{
+  "base_test_path": "integration",
+  "cache_path": "cache-style.db",
+  "expectation_paths": [
+      "expectations/platform-all"
+  ],
+  "ignore_paths": [
+      "ignores/platform-all.json",
+      "ignores/platform-linux.json"
+  ],
+  "metric_path": "linux-gcc8-release",
+  "probes": [
+      "probeGFX",
+      "probeNetwork"
+  ]
+}

platform/ios/test/BUILD.bazel

@@ -1,9 +1,9 @@
-load("//bazel:flags.bzl", "CPP_FLAGS", "MAPLIBRE_FLAGS", "WARNING_FLAGS")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
 load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "swift_library",
 )
+load("//bazel:flags.bzl", "CPP_FLAGS", "MAPLIBRE_FLAGS", "WARNING_FLAGS")
 
 objc_library(
     name = "ios_tests_objc_srcs",
@@ -54,6 +54,7 @@ swift_library(
 
 ios_unit_test(
     name = "ios_test",
+    timeout = "long",
     minimum_os_version = "12.0",
     runner = "@build_bazel_rules_apple//apple/testing/default_runner:ios_xctestrun_ordered_runner",
     visibility = [
@@ -63,11 +64,11 @@ ios_unit_test(
         "ios_tests_objc_srcs",
         "ios_tests_objcpp_srcs",
         "ios_tests_swift_srcs",
+        "//platform/darwin:darwin_objc_hdrs",
+        "//platform/darwin:darwin_objcpp_hdrs",
         "//platform/darwin:shared_tests_objc_srcs",
         "//platform/darwin:shared_tests_objcpp_srcs",
         "//platform/darwin:shared_tests_swift_srcs",
-        "//platform/darwin:darwin_objc_hdrs",
-        "//platform/darwin:darwin_objcpp_hdrs",
     ],
 )
 

src/mbgl/gfx/drawable_builder.cpp

@@ -12,7 +12,7 @@ namespace gfx {
 
 DrawableBuilder::DrawableBuilder(std::string name_)
     : name(std::move(name_)),
-      vertexAttrNameId(StringIndexer::get("a_pos")),
+      vertexAttrNameId(stringIndexer().get("a_pos")),
       renderPass(mbgl::RenderPass::Opaque),
       impl(std::make_unique<Impl>()) {}