Tweaks to publish script using changesets

Author: wjthieme

.github/actions/push/action.yml

@@ -0,0 +1,45 @@
+name: 'Push'
+description: 'Push changes to the remote repository.'
+
+branding:
+  icon: git-branch
+  color: blue
+
+inputs:
+  branch:
+    description: 'Branch to push to'
+    required: false
+    default: 'main'
+  tags:
+    description: 'Push tags'
+    required: false
+    default: 'false'
+  message:
+    description: 'Commit message (empty means no commit)'
+    required: false
+  user:
+    description: 'Git user name'
+    required: false
+    default: 'github-actions[bot]'
+
+runs:
+  using: "composite"
+  steps:
+    - name: Setup Git User
+      run: |
+        git config --global user.name "${{ inputs.user }}"
+        git config --global user.email "${{ inputs.user }}@users.noreply.github.com"
+      shell: bash
+    - name: Git Commit
+      if: ${{ inputs.message != '' }}
+      run: |
+        git add .
+        git commit -m "${{ inputs.message }}"
+      shell: bash
+    - name: Push Changes
+      run: |
+        git push origin ${{ inputs.branch }}
+        if [ ${{ inputs.tags }} = 'true' ]; then
+          git push --tags
+        fi
+      shell: bash

.github/actions/sync/action.yml

@@ -24,11 +24,3 @@ runs:
           done
         ' _ {} +
       shell: bash
-    - name: Push Changes
-      run: |
-        if [[ $(git status --porcelain) ]]; then
-          git add **/Cargo.toml
-          git commit -m "Sync cargo versions"
-          git push
-        fi
-      shell: bash

.github/workflows/automerge.yml

@@ -8,7 +8,7 @@ jobs:
 
   automerge:
     runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' || github.actor == 'github-actions[bot]' }}
+    if: ${{ github.actor == 'dependabot[bot]' }}
     permissions:
       pull-requests: write
       contents: write

.github/workflows/checks.yml

@@ -50,7 +50,7 @@ jobs:
 
   changeset:
     runs-on: ubuntu-latest
-    if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'github-actions[bot]' }}
+    if: ${{ github.actor != 'dependabot[bot]' }}
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4

.github/workflows/publish.yml

@@ -1,8 +1,7 @@
 name: Publish
 
 on:
-  push:
-    branches: [main]
+  workflow_dispatch:
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}
 
@@ -11,26 +10,29 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: write
-      pull-requests: write
-    outputs:
-      published: ${{ steps.changesets.outputs.published }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          ssh-key: ${{ secrets.GH_DEPLOY_KEY }}
       - name: Setup Anchor
         uses: ./.github/actions/anchor
       - name: Install dependencies
         run: yarn install
-      - name: Create Release Pull Request or Publish
-        id: changesets
-        uses: changesets/action@v1
-        with:
-          commit: 'Publish packages'
-          title: 'Publish packages'
-          publish: 'yarn publish'
+      - name: Determine New Versions
+        run: yarn changeset version
+      - name: Update Cargo Version Numbers
+        uses: ./.github/actions/sync
+      - name: Publish Packages
+        run: yarn publish
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_TOKEN }}
-      - name: Update Cargo Version Numbers
-        uses: ./.github/actions/sync
+      - name: Tag Release
+        run: yarn changeset tag
+      - name: Push Changes
+        uses: ./.github/actions/push
+        with:
+          branch: main
+          message: Publish Packages
+          user: changests[bot]

README.md

@@ -92,12 +92,10 @@ If you want to stream the logs of a specific command you can add the `--output-s
 
 When contributing to this repository, please include a changeset with your changes. You can create a changeset by running `yarn changeset`. If your changes are not related to any of the packages, you can create an empty changeset by running `yarn changeset --empty`. In your pull request, you do not have to manually update the version numbers.
 
-When changes are detected in main, `changesets` will automatically create a pull request to update the version of the packages. Once that pull request is merged, the packages will be published to the npm and cargo automatically.
+To publish packages to npm and cargo, you can run run the `publish` gh action. This will update the versions of the packages and publish them to npm and cargo.
 
 # Support
 
-### Questions
-
 Have problems integrating with the SDK? Pop by over to the Orca [Discord](https://discord.gg/nSwGWn5KSG) #dev-questions channel and chat with one of our engineers.
 
 ### Feedback