v0.0.0-pr258-20260401065919

.changeset/brown-cycles-attack.md

@@ -0,0 +1,5 @@
+---
+"@changesets/action": minor
+---
+
+Support draft version PR modes with a new `prDraft` input. Use `create` to create new version PRs as drafts, or `always` to also convert existing version PRs back to draft when updating them.

.changeset/plenty-areas-tie.md

@@ -0,0 +1,5 @@
+---
+"@changesets/action": patch
+---
+
+Fixed initial `.changeset` state being picked up, when `cwd` parameter is provided

.changeset/splendid-facts-like.md

@@ -0,0 +1,5 @@
+---
+"@changesets/action": patch
+---
+
+Fixed `.changeset` state being picked for the version command when `cwd` parameter is provided

.github/CODEOWNERS

@@ -1,5 +0,0 @@
-/.github/workflows/** @Andarist @emmatown
-/action.yml @Andarist @emmatown
-/scripts/bump.ts @Andarist @emmatown
-/scripts/release.ts @Andarist @emmatown
-/scripts/release-pr.ts @Andarist @emmatown

.github/actions/ci-setup/action.yml

@@ -4,7 +4,7 @@ runs:
   using: composite
   steps:
     - name: Setup Node.js
-      uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+      uses: actions/setup-node@v6
       with:
         node-version-file: ".node-version"
         cache: yarn

.github/workflows/ci.yml

@@ -1,46 +1,26 @@
-name: CI
+name: Node CI
 
 on:
-  pull_request:
   push:
-    branches: [main]
+    branches:
-  merge_group:
+      - main
-    branches: [main]
+  pull_request:
-
-permissions:
-  contents: read
 
 jobs:
-  test:
+  build:
-    name: Test
     timeout-minutes: 20
+
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@v4
-      - uses: ./.github/actions/ci-setup
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
-      - name: Test
-        run: yarn test
-
-  typecheck:
-    name: Typecheck
-    timeout-minutes: 20
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - uses: ./.github/actions/ci-setup
 
       - name: Typecheck
         run: yarn typecheck
 
-  ci-ok:
+      - name: Test
-    name: CI OK
+        run: yarn test
-    runs-on: ubuntu-latest
-    if: always()
-    needs: [test, typecheck]
-    steps:
-      - name: Exit with error if some jobs are not successful
-        run: exit 1
-        if: ${{ always() && (contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') || contains(needs.*.result, 'cancelled')) }}

.github/workflows/publish.yml

@@ -1,62 +0,0 @@
-name: Publish
-
-on:
-  push:
-    branches:
-      - main
-
-concurrency: ${{ github.workflow }}-${{ github.ref }}
-
-permissions: {} # each job should define its own permission explicitly
-
-jobs:
-  version:
-    name: Version
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    outputs:
-      hasChangesets: ${{ steps.changesets.outputs.hasChangesets }}
-    permissions:
-      contents: write # to create release (changesets/action)
-      issues: write # to post issue comments (changesets/action)
-      pull-requests: write # to create pull request (changesets/action)
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: ./.github/actions/ci-setup
-
-      - name: Build
-        run: yarn build
-
-      - name: Create or update release pull request
-        id: changesets
-        uses: ./
-        with:
-          version: yarn bump
-
-  publish:
-    name: Publish
-    if: needs.version.outputs.hasChangesets == 'false'
-    needs: version
-    runs-on: ubuntu-latest
-    environment: marketplace
-    timeout-minutes: 20
-    steps:
-      - uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
-        id: app-token
-        with:
-          client-id: ${{ vars.APP_CLIENT_ID }}
-          private-key: ${{ secrets.APP_PRIVATE_KEY }}
-
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          token: ${{ steps.app-token.outputs.token }}
-
-      - uses: ./.github/actions/ci-setup
-
-      - name: Build
-        run: yarn build
-
-      - name: Publish to marketplace
-        uses: ./
-        with:
-          publish: yarn release

.github/workflows/release-pr.yml

@@ -4,16 +4,10 @@ on:
   issue_comment:
     types: [created]
 
-permissions: {}
-
 jobs:
   release_check:
     if: github.repository == 'changesets/action' && github.event.issue.pull_request && startsWith(github.event.comment.body, '/release-pr')
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      issues: write
-      pull-requests: read
     steps:
       - id: report_in_progress
         run: |
@@ -21,18 +15,6 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - id: parse_command
-        run: |
-          if [[ "$COMMENT_BODY" =~ ^/release-pr[[:space:]]+([0-9a-fA-F]{7,40})[[:space:]]*$ ]]
-          then
-            echo "requested_sha=${BASH_REMATCH[1]}" >> "$GITHUB_OUTPUT"
-          else
-            echo "Expected '/release-pr <sha>' where <sha> is a 7-40 character commit SHA."
-            exit 1
-          fi
-        env:
-          COMMENT_BODY: ${{ github.event.comment.body }}
-
       - id: check_authorization
         run: |
           if [[ $AUTHOR_ASSOCIATION == 'MEMBER' || $AUTHOR_ASSOCIATION == 'OWNER' || $AUTHOR_ASSOCIATION == 'COLLABORATOR' ]]
@@ -45,80 +27,22 @@ jobs:
         env:
           AUTHOR_ASSOCIATION: ${{ github.event.comment.author_association }}
 
-      - id: resolve_requested_sha
-        run: |
-          requested_sha=$(echo "$REQUESTED_SHA" | tr '[:upper:]' '[:lower:]')
-
-          mapfile -t matches < <(
-            gh api /repos/${{ github.repository }}/pulls/${{ github.event.issue.number }}/commits --paginate --jq '.[].sha' |
-              awk -v sha="$requested_sha" 'index(tolower($0), sha) == 1 { print $0 }'
-          )
-
-          if [[ ${#matches[@]} -eq 0 ]]
-          then
-            echo "Requested SHA $REQUESTED_SHA is not part of this pull request."
-            exit 1
-          fi
-
-          if [[ ${#matches[@]} -gt 1 ]]
-          then
-            echo "Requested SHA $REQUESTED_SHA is ambiguous for this pull request."
-            exit 1
-          fi
-
-          resolved_sha="${matches[0]}"
-          pr_head_sha=$(gh pr view ${{ github.event.issue.number }} --json headRefOid --jq '.headRefOid')
-
-          if [[ "$resolved_sha" != "$pr_head_sha" ]]
-          then
-            echo "Requested SHA $resolved_sha is not the current PR head $pr_head_sha."
-            exit 1
-          fi
-
-          echo "resolved_sha=$resolved_sha" >> "$GITHUB_OUTPUT"
-          echo "pr_head_sha=$pr_head_sha" >> "$GITHUB_OUTPUT"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          REQUESTED_SHA: ${{ steps.parse_command.outputs.requested_sha }}
-
-      - id: get_pr_head_repository
-        run: |
-          echo "head_repository=$(gh pr view ${{ github.event.issue.number }} --json headRepositoryOwner,headRepository --jq '.headRepositoryOwner.login + "/" + .headRepository.name')" >> "$GITHUB_OUTPUT"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
     outputs:
       in_progress_reaction_id: ${{ steps.report_in_progress.outputs.in_progress_reaction_id }}
-      requested_sha: ${{ steps.parse_command.outputs.requested_sha }}
-      resolved_sha: ${{ steps.resolve_requested_sha.outputs.resolved_sha }}
-      pr_head_sha: ${{ steps.resolve_requested_sha.outputs.pr_head_sha }}
-      head_repository: ${{ steps.get_pr_head_repository.outputs.head_repository }}
 
   release:
     if: github.repository == 'changesets/action'
     timeout-minutes: 20
     runs-on: ubuntu-latest
     needs: release_check
-    permissions:
-      contents: write
-      issues: write
-      pull-requests: write
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ci-setup
 
-      - name: Fetch validated commit from pull request head repository
+      - name: Checkout pull request
-        run: |
+        run: gh pr checkout ${{ github.event.issue.number }}
-          git remote add pr-head https://github.com/$HEAD_REPOSITORY.git
-          git fetch --no-tags pr-head $RESOLVED_SHA
         env:
-          HEAD_REPOSITORY: ${{ needs.release_check.outputs.head_repository }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RESOLVED_SHA: ${{ needs.release_check.outputs.resolved_sha }}
-
-      - name: Checkout validated commit
-        run: git checkout --detach $RESOLVED_SHA
-        env:
-          RESOLVED_SHA: ${{ needs.release_check.outputs.resolved_sha }}
 
       - name: Check if Version Packages PR
         id: check_version_packages
@@ -154,8 +78,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - run: |
+      - run: gh pr comment ${{ github.event.issue.number }} --body "The [${{ github.repository }}@$(git rev-parse HEAD)](https://github.com/${{ github.repository }}/commit/$(git rev-parse HEAD)) release triggered by [this comment](${{ github.event.comment.url }}) has [succeeded](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})."
-          gh pr comment ${{ github.event.issue.number }} --body "The release for \`${{ needs.release_check.outputs.resolved_sha }}\` triggered by [this comment](${{ github.event.comment.url }}) has [succeeded](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}). Published commit: [${{ github.repository }}@$(git rev-parse HEAD)](https://github.com/${{ github.repository }}/commit/$(git rev-parse HEAD))."
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -164,9 +87,6 @@ jobs:
     timeout-minutes: 2
     runs-on: ubuntu-latest
     if: failure() && github.repository == 'changesets/action' && (needs.release_check.result == 'failure' || needs.release.result == 'failure')
-    permissions:
-      issues: write
-      pull-requests: write
     steps:
       - run: gh api /repos/${{ github.repository }}/issues/comments/${{ github.event.comment.id }}/reactions -f content='-1'
         env:
@@ -176,8 +96,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - run: |
+      - run: gh pr comment ${{ github.event.issue.number }} --body "The release triggered by [this comment](${{ github.event.comment.url }}) has [failed](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})."
-          gh pr comment ${{ github.event.issue.number }} --body "The release for \`${{ needs.release_check.outputs.requested_sha }}\` triggered by [this comment](${{ github.event.comment.url }}) has [failed](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})."
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GH_REPO: ${{ github.repository }}

.github/workflows/version-or-publish.yml

@@ -0,0 +1,27 @@
+name: Version or Publish
+
+on:
+  push:
+    branches:
+      - main
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  changesets:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/ci-setup
+
+      - name: Build
+        run: yarn build
+
+      - name: Create Release Pull Request or Publish
+        id: changesets
+        uses: ./
+        with:
+          version: yarn bump
+          publish: yarn release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,17 +1,5 @@
 # @changesets/action
 
-## 1.8.0
-
-### Minor Changes
-
-- [#258](https://github.com/changesets/action/pull/258) [`f5dbf72`](https://github.com/changesets/action/commit/f5dbf72f96949cb0daf45152f0f63062df70e97d) Thanks [@tom-sherman](https://github.com/tom-sherman)! - Support draft version PR modes with a new `prDraft` input. Use `create` to create new version PRs as drafts, or `always` to also convert existing version PRs back to draft when updating them.
-
-### Patch Changes
-
-- [#502](https://github.com/changesets/action/pull/502) [`6002dbd`](https://github.com/changesets/action/commit/6002dbd987f49a3c0a134910d9c7bca975b79977) Thanks [@oshytiko](https://github.com/oshytiko)! - Fixed initial `.changeset` state being picked up, when `cwd` parameter is provided
-
-- [#536](https://github.com/changesets/action/pull/536) [`81b3f61`](https://github.com/changesets/action/commit/81b3f61ebffcb868f73e4c0b2682517149c834a2) Thanks [@radnan](https://github.com/radnan)! - Fixed `.changeset` state being picked for the version command when `cwd` parameter is provided
-
 ## 1.7.0
 
 ### Minor Changes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@changesets/action",
-  "version": "1.8.0",
+  "version": "1.7.0",
   "main": "dist/index.js",
   "type": "module",
   "license": "MIT",