Skip to content

Commit d783d53

Browse files
committed
Merge remote-tracking branch 'origin/main' into agent/fix-cargo-declared-floor
# Conflicts: # crates/socket-patch-cli/CLI_CONTRACT.md
2 parents 45b4799 + e76cb9b commit d783d53

309 files changed

Lines changed: 35460 additions & 18345 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@ jobs:
297297
- name: Lint release readiness
298298
env:
299299
EVENT_NAME: ${{ github.event_name }}
300-
BASE_SHA: ${{ github.event.pull_request.base.sha }}
301300
HEAD_REF: ${{ github.head_ref }}
302301
BASE_REF: ${{ github.base_ref }}
303302
HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
@@ -310,8 +309,13 @@ jobs:
310309
fi
311310
if [ "$EVENT_NAME" = "pull_request" ]; then
312311
# Compare the workspace version against the PR base to detect a
313-
# version bump. The shallow checkout doesn't have the base
314-
# commit; fetch just that object.
312+
# version bump. Take the base from the first parent of the
313+
# checked-out refs/pull/N/merge commit, i.e. the main commit this
314+
# merge was built on: github.event.pull_request.base.sha can lag
315+
# behind it, so a PR that merged main across a release saw a
316+
# phantom bump and failed --tag-check. The shallow checkout
317+
# doesn't have the parent; fetch just that object.
318+
BASE_SHA="$(git cat-file -p HEAD | sed -n 's/^parent //p' | head -1)"
315319
git fetch --quiet --depth 1 origin "$BASE_SHA"
316320
BASE_VERSION="$(git show "$BASE_SHA:Cargo.toml" | grep '^version = ' | head -1 | sed 's/version = "\(.*\)"/\1/')"
317321
HEAD_VERSION="$(grep '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')"
@@ -972,7 +976,7 @@ jobs:
972976

973977
- name: Run npm schema tests
974978
# The `./schema` export's zod tests. `npm install --no-save`, not
975-
# `npm ci`, for the reason publish-npm.yml gives (a version-synced
979+
# `npm ci`, for the reason release.yml's npm-publish job gives (a version-synced
976980
# lock can name platform packages not yet on the registry); the
977981
# platform binaries are optional and not needed here. The pack
978982
# test runs again once `npm test` has built dist/, so it also
@@ -1897,6 +1901,7 @@ jobs:
18971901
- {os: ubuntu-latest, suite: e2e_vendor_pypi_build, uv: '0.5.5', test_filter: --include-ignored}
18981902
- {os: ubuntu-latest, suite: e2e_vex_build, test_filter: 'poetry:: --ignored', poetry: '1.0.10'}
18991903
- {os: ubuntu-latest, suite: e2e_vex_build, test_filter: 'poetry:: --ignored', poetry: '1.1.15'}
1904+
- {os: ubuntu-latest, suite: e2e_vex_build, test_filter: 'poetry:: --ignored', poetry: '1.3.2'}
19001905
- {os: ubuntu-latest, suite: e2e_vex_build, test_filter: 'poetry:: --ignored', poetry: '1.8.5'}
19011906
- {os: ubuntu-latest, suite: e2e_vex_build, test_filter: 'poetry:: --ignored', poetry: '2.0.1'}
19021907
- {os: ubuntu-latest, suite: e2e_vex_build, test_filter: 'pdm:: --ignored', pdm: '1.4.5'}
@@ -1911,14 +1916,14 @@ jobs:
19111916
- {os: ubuntu-latest, suite: e2e_vex_build, test_filter: 'pipenv:: --ignored', pipenv: '2022.12.19'}
19121917
- {os: ubuntu-latest, suite: e2e_redirect_maven_build e2e_vendor_maven_build, jvm_tool: maven, maven: '3.6.3'}
19131918
- {os: ubuntu-latest, suite: e2e_redirect_maven_build e2e_vendor_maven_build, jvm_tool: maven, maven: '3.8.9'}
1914-
- {os: ubuntu-latest, suite: e2e_redirect_maven_build e2e_vendor_maven_build, jvm_tool: maven, maven: '4.0.0-rc-6'}
1919+
- {os: ubuntu-latest, suite: e2e_redirect_maven_build e2e_vendor_maven_build, jvm_tool: maven, maven: '4.0.0-rc-7'}
19151920
- {os: ubuntu-latest, suite: e2e_redirect_maven_build, jvm_tool: maven, maven: '3.9.3'}
19161921
- {os: ubuntu-latest, suite: e2e_redirect_maven_build, jvm_tool: maven, maven: '3.9.4'}
19171922
- {os: ubuntu-latest, suite: e2e_vendor_jvm_build, jvm_tool: maven, maven: '3.6.3', test_filter: '--ignored maven_reactor'}
19181923
- {os: ubuntu-latest, suite: e2e_vendor_jvm_build, jvm_tool: maven, maven: '3.8.9', test_filter: '--ignored maven_reactor'}
19191924
- {os: ubuntu-latest, suite: e2e_vendor_jvm_build, jvm_tool: maven, maven: '3.9.2', test_filter: '--ignored maven_reactor'}
19201925
- {os: ubuntu-latest, suite: e2e_vendor_jvm_build, jvm_tool: maven, maven: '3.9.16', test_filter: '--ignored maven_reactor'}
1921-
- {os: ubuntu-latest, suite: e2e_vendor_jvm_build, jvm_tool: maven, maven: '4.0.0-rc-6', test_filter: '--ignored maven_reactor'}
1926+
- {os: ubuntu-latest, suite: e2e_vendor_jvm_build, jvm_tool: maven, maven: '4.0.0-rc-7', test_filter: '--ignored maven_reactor'}
19221927
- {os: ubuntu-latest, suite: 'e2e_gradle_discovery_build e2e_gradle_agent_build e2e_redirect_gradle_build', jvm_tool: gradle, gradle: '6.9.4', java: '11', test_filter: '--ignored gradle_agent_ gradle_hosted_3 gradle_hosted_4 gradle_hosted_5'}
19231928
- {os: ubuntu-latest, suite: e2e_redirect_gradle_build, jvm_tool: gradle, gradle: '6.9.4', java: '11', test_filter: '--ignored gradle_hosted_b gradle_hosted_c gradle_hosted_d gradle_hosted_e gradle_hosted_f gradle_hosted_l gradle_hosted_m gradle_hosted_n gradle_hosted_o gradle_hosted_p'}
19241929
- {os: ubuntu-latest, suite: e2e_redirect_gradle_build, jvm_tool: gradle, gradle: '6.9.4', java: '11', test_filter: '--ignored gradle_hosted_ --skip gradle_hosted_3 --skip gradle_hosted_4 --skip gradle_hosted_5 --skip gradle_hosted_b --skip gradle_hosted_c --skip gradle_hosted_d --skip gradle_hosted_e --skip gradle_hosted_f --skip gradle_hosted_l --skip gradle_hosted_m --skip gradle_hosted_n --skip gradle_hosted_o --skip gradle_hosted_p'}

‎.github/workflows/publish-npm.yml‎

Lines changed: 0 additions & 268 deletions
This file was deleted.

0 commit comments

Comments
 (0)