Skip to content

Commit 2dc8ba8

Browse files
committed
Merge remote-tracking branch 'origin/main' into mbg/cherry-picks/macos-deprecation
2 parents 18f7f5c + 9be075c commit 2dc8ba8

5 files changed

Lines changed: 13267 additions & 5474 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ updates:
1616
# This might be fixed when we move to eslint v9.
1717
- dependency-name: "eslint-plugin-import"
1818
versions: [">=2.30.0"]
19+
20+
# Some of our dependencies are lagging behind with support for new versions of
21+
# `undici` which is why we have to override it in `package.json`. Dependabot
22+
# workflows fail when they try to update a dependency that is explicitly
23+
# overriden. Since this happens somewhat routinely at the moment, we are
24+
# excluding `undici` here and have to manually update it when needed.
25+
- dependency-name: "undici"
26+
versions: [">=7.30.1"]
1927
groups:
2028
npm-minor:
2129
patterns:

‎.github/workflows/debug-artifacts-failure-safe.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ jobs:
9797
uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
9898
- name: Check expected artifacts exist
9999
run: |
100+
VERSIONS="stable-v2.20.7 default linked nightly-latest"
100101
LANGUAGES="cpp csharp go java javascript python"
101102
for version in $VERSIONS; do
102103
echo "Artifacts from version $version:"

0 commit comments

Comments
 (0)