neaten bump and release commands

Author: expipiplus1

.github/workflows/bump-command.yml

@@ -1,13 +1,37 @@
-name: bump-command
-on:
-  repository_dispatch:
-    types: [bump-command]
+name: Bump command
+
+on: issue_comment
 
 jobs:
   bump:
     runs-on: ubuntu-20.04
+
+    # Only run if we're invoked with a new command comment on a pull request.
+    if: |
+      github.event_name == 'issue_comment' && github.event.action == 'created'
+      && github.event.issue.pull_request != null
+      && startsWith(github.event.comment.body, '/bump')
+
     steps:
-    - uses: cachix/install-nix-action@v11
+    - name: Check for Command
+      id: command
+      uses: xt0rted/slash-command-action@v1
+      continue-on-error: true
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        command: bump
+        reaction: 'true'
+        reaction-type: eyes
+        allow-edits: 'true'
+        permission-level: write
+
+    - name: Get PR Branch
+      id: comment-branch
+      uses: xt0rted/pull-request-comment-branch@v1
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+
+    - uses: cachix/install-nix-action@v12
       with:
         nix_path: nixpkgs=channel:nixos-unstable
 
@@ -17,15 +41,14 @@ jobs:
         ssh-key: ${{ secrets.DEPLOY_KEY }}
         repository: ${{ github.event.client_payload.pull_request.head.repo.full_name
           }}
-        ref: ${{ github.event.client_payload.pull_request.head.ref }}
-        submodules: recursive
+        ref: ${{ steps.comment-branch.outputs.ref }}
 
     - uses: expipiplus1/action-automation/bump-version@HEAD
       with:
         packageInfos: |
           exact-real v .
         packageVersions: |
-          ${{ toJson(github.event.client_payload.slash_command.args.named) }}
+          { "exact-real": "${{ steps.command.outputs.command-arguments }}" }
 
     - run: |
-        git push origin HEAD:${{ github.event.client_payload.pull_request.head.ref }}
+        git push origin HEAD:"${{ steps.comment-branch.outputs.ref }}"

.github/workflows/release.yml

@@ -10,7 +10,11 @@ jobs:
     name: Create Release
     runs-on: ubuntu-20.04
     steps:
-    - uses: cachix/install-nix-action@v8
+    - uses: cachix/install-nix-action@v12
+      with:
+        extra_nix_config: |
+          trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= orion:s0C06f1M46DCpHUUP2r8iIrhfytkCbXWltMeMMa4jbw= expipiplus1/update-nix-fetchgit:Z33K0KEImsos+kVTFvZxfLxaBi+D1jEeB6cX0uCo7B0=
+          substituters = https://cache.nixos.org/ s3://nix-cache?region=ap-southeast-1&scheme=https&endpoint=binarycache.home.monoid.al
     - uses: actions/checkout@v2
 
     - name: Build project

.github/workflows/tag-release.yml

@@ -9,7 +9,7 @@ jobs:
   update:
     runs-on: ubuntu-20.04
     steps:
-    - uses: cachix/install-nix-action@v11
+    - uses: cachix/install-nix-action@v12
       with:
         nix_path: nixpkgs=channel:nixos-unstable
     - uses: actions/checkout@v2