Merge remote-tracking branch 'upstream/main' into cog

maplibre · Dec 20, 2024 · 4504cb7 · 4504cb7
2 parents d716eb1 + 321b7f0
commit 4504cb7
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 61 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,9 +5,27 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+    groups:
+      all-actions-version-updates:
+        applies-to: version-updates
+        patterns:
+          - "*"
+      all-actions-security-updates:
+        applies-to: security-updates
+        patterns:
+          - "*"
   - package-ecosystem: cargo
     directory: "/"
     schedule:
       interval: daily
       time: "02:00"
     open-pull-requests-limit: 10
+    groups:
+      all-cargo-version-updates:
+        applies-to: version-updates
+        patterns:
+          - "*"
+      all-cargo-security-updates:
+        applies-to: security-updates
+        patterns:
+          - "*"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -318,8 +318,9 @@ jobs:
       fail-fast: true
       matrix:
         include:
-          - target: x86_64-apple-darwin
-            os: macos-13
+          # temporary disabled due to an issue with homebrew which is difficult to debug
+          # - target: x86_64-apple-darwin
+          #   os: macos-13
           - target: x86_64-pc-windows-msvc
             os: windows-latest
             ext: '.exe'