diff --git a/.changeset/green-birds-push.md b/.changeset/green-birds-push.md new file mode 100644 index 00000000..518bf2d0 --- /dev/null +++ b/.changeset/green-birds-push.md @@ -0,0 +1,5 @@ +--- +"@changesets/action": patch +--- + +Fixed a regression making it impossible to sync new versions of versioning pull requests with base branch updates when using GitHub API pushes. diff --git a/package.json b/package.json index 861f1104..1c8dbb5d 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@actions/exec": "^3.0.0", "@actions/github": "^9.1.1", "@changesets/get-release-plan": "^5.0.0-next.7", - "@changesets/ghcommit": "^3.0.0-next.1", + "@changesets/ghcommit": "^3.0.0", "@changesets/git": "^4.0.0-next.6", "@changesets/pre": "^3.0.0-next.6", "@changesets/read": "^1.0.0-next.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 44dc466a..dfcc4414 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -29,8 +29,8 @@ importers: specifier: ^5.0.0-next.7 version: 5.0.0-next.7 '@changesets/ghcommit': - specifier: ^3.0.0-next.1 - version: 3.0.0-next.1 + specifier: ^3.0.0 + version: 3.0.0 '@changesets/git': specifier: ^4.0.0-next.6 version: 4.0.0-next.6 @@ -231,8 +231,8 @@ packages: resolution: {integrity: sha512-ek+tXy+SHshWQD5V4uL6pciazjhm/Yt+KxIQEW0W6vIyyjWvFBY6t0xfsv/hCc/+u11riHcoWGwHkGYqC869EQ==} engines: {node: ^22.11 || ^24 || >=26} - '@changesets/ghcommit@3.0.0-next.1': - resolution: {integrity: sha512-wWhc316LkE64P0fbNoKxEyUk5vpkQEF52m1XUBF2xJrE++cGq0PZSu9ZeXLKExOdXKVkAOGokmnXlfnYzCt1NQ==} + '@changesets/ghcommit@3.0.0': + resolution: {integrity: sha512-od3Y0BhzH+zg8ysSiXFiwj1g85g98mt/WDoGdl2EIjRY8TXxsr8JuaRvHafB2kNGqm9qONBQbPX9UOa4uet+6Q==} engines: {node: ^22.11 || ^24 || >=26} '@changesets/git@4.0.0-next.6': @@ -1601,7 +1601,7 @@ snapshots: '@changesets/types': 7.0.0-next.6 '@manypkg/get-packages': 3.1.0 - '@changesets/ghcommit@3.0.0-next.1': + '@changesets/ghcommit@3.0.0': dependencies: tinyexec: 1.2.4 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 2ce51cd3..962c04d7 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -12,7 +12,6 @@ minimumReleaseAgeExclude: - "@changesets/get-dependents-graph@3.0.0-next.6" - "@changesets/get-github-info@1.0.0-next.3" - "@changesets/get-release-plan@5.0.0-next.7" - - "@changesets/ghcommit@3.0.0-next.1" - "@changesets/git@4.0.0-next.6" - "@changesets/parse@1.0.0-next.7" - "@changesets/pre@3.0.0-next.6" diff --git a/src/github.ts b/src/github.ts index 802d3818..c03cbda8 100644 --- a/src/github.ts +++ b/src/github.ts @@ -253,6 +253,7 @@ export class GitHub { base: { commit: context.sha, }, + force: true, cwd: this.cwd, }); return;