Merge branch 'main' into globe

maplibre · Apr 10, 2024 · 1d1b34e · 1d1b34e
2 parents cceaebc + c197cc3
commit 1d1b34e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -15,6 +15,3 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    ignore:
-      - dependency-name: "codecov/codecov-action"
-        versions: ["4"]
diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml
@@ -47,10 +47,11 @@ jobs:
       - run: npm ci
       - run: npm run test-unit-ci
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           files: ${{ github.workspace }}/coverage/unit/codecov.json
           verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   integration-tests:
     name: Integration tests
@@ -104,10 +105,11 @@ jobs:
           CURRENT_SPLIT_INDEX: ${{ matrix.split }}
         if: success() || failure()
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           files: ${{ github.workspace }}/coverage/render/codecov.json
           verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}
       - name: Upload render test failure
         if: failure()
         uses: actions/upload-artifact@v4

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -89,7 +89,7 @@
     "dts-bundle-generator": "^9.3.1",
     "eslint": "^8.57.0",
     "eslint-config-mourner": "^3.0.0",
-    "eslint-plugin-html": "^8.0.0",
+    "eslint-plugin-html": "^8.1.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jest": "^28.2.0",
     "eslint-plugin-react": "^7.34.1",