Hookup hotshot

.github/workflows/dependabot_pr.yml

@@ -0,0 +1,12 @@
+### .github/workflows/dependabot_pr.yml
+### This workflow doesn't have access to secrets and has a read-only token
+name: Dependabot PR Check
+on:
+  pull_request
+
+jobs:
+  check-dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - run: echo "PR created by Dependabot"

.github/workflows/release.yml

@@ -16,11 +16,11 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.18.1
+          go-version: 1.24.9
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v5
         with:
-          version: latest
+          version: v2.10.2
           args: release -f .goreleaser/mac.yml --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
@@ -47,11 +47,11 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.18.1
+          go-version: 1.24.9
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v5
         with:
-          version: latest
+          version: v2.10.2
           args: release -f .goreleaser/linux.yml --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
@@ -66,45 +66,44 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.18.1
+          go-version: 1.24.9
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v5
         with:
-          version: latest
+          version: v2.10.2
           args: release -f .goreleaser/windows.yml --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
 
-  build-windows-npm:
-    runs-on: windows-latest
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.18.1
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
-        with:
-          version: latest
-          args: release -f .goreleaser/windows-npm.yml --clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
-
   publish-npm:
     runs-on: ubuntu-latest
-    needs: [build-windows-npm, build-linux, build-mac]
+    needs: [build-windows, build-linux, build-mac]
     steps:
       - uses: actions/checkout@v4
         with:
-          # Checkout on main so that the later commit works
-          ref: main
           # With permission to push to a protected branch
           token: ${{ secrets.READ_WRITE_PAT }}
-
+          fetch-depth: 0 # Required to find branches for a tag
+
+      - name: Determine release branch
+        id: get_branch
+        run: |
+          # Find the branch that contains the tag.
+          # Prefers 'main', then 'master', then the first branch found.
+          BRANCHES=$(git branch -r --contains ${{ github.ref_name }} | sed 's/ *origin\///' | grep -v HEAD)
+          if echo "$BRANCHES" | grep -q -w "main"; then
+            RELEASE_BRANCH="main"
+          elif echo "$BRANCHES" | grep -q -w "master"; then
+            RELEASE_BRANCH="master"
+          else
+            RELEASE_BRANCH=$(echo "$BRANCHES" | head -n 1)
+          fi
+          echo "RELEASE_BRANCH=${RELEASE_BRANCH}" >> $GITHUB_OUTPUT
+          echo "Determined release branch for commit: ${RELEASE_BRANCH}"
+
+      - name: Checkout release branch
+        run: git checkout ${{ steps.get_branch.outputs.RELEASE_BRANCH }}
+
       - uses: actions/setup-node@v4
         with:
           node-version: "20.x"
@@ -133,6 +132,18 @@ jobs:
           add: 'package.json'
 
       - run: npm ci
-      - run: npm publish
+
+      - name: Determine npm tag for pre-releases
+        id: npm_tag
+        run: |
+          TAG_VERSION="${{ steps.tag-version.outputs.TAG_VERSION }}"
+          NPM_TAG="latest"
+          if [[ "$TAG_VERSION" == *-* ]]; then
+            NPM_TAG=$(echo "$TAG_VERSION" | cut -d'-' -f2 | cut -d'.' -f1)
+          fi
+          echo "tag=${NPM_TAG}" >> $GITHUB_OUTPUT
+          echo "npm tag: ${NPM_TAG}"
+
+      - run: npm publish --tag ${{ steps.npm_tag.outputs.tag }}
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/test-acceptance.yml

@@ -0,0 +1,24 @@
+name: Acceptance Tests
+
+on:
+  pull_request:
+    branches:
+      - next
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      HOOKDECK_CLI_TESTING_API_KEY: ${{ secrets.HOOKDECK_CLI_TESTING_API_KEY }}
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: "1.24.9"
+
+      - name: Run Go Acceptance Tests
+        run: go test ./test/acceptance/... -v -timeout 10m

.github/workflows/test-homebrew-build.yml

@@ -0,0 +1,57 @@
+name: Homebrew Build and Installation Tests
+
+on:
+  pull_request:
+    branches:
+      - main
+
+  workflow_dispatch:
+    inputs:
+      run_install_tests:
+        description: "Run installation tests"
+        required: false
+        default: "false"
+        type: choice
+        options:
+          - "false"
+          - "true"
+
+jobs:
+  test-homebrew-build:
+    runs-on: macos-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: "go.mod"
+
+      - name: Verify Homebrew is installed
+        run: |
+          echo "Homebrew version:"
+          brew --version
+
+      - name: Install GoReleaser
+        run: brew install goreleaser
+
+      - name: Make test script executable
+        run: chmod +x test-scripts/test-homebrew-build.sh
+
+      - name: Run build validation
+        run: ./test-scripts/test-homebrew-build.sh
+
+      - name: Run installation tests
+        run: ./test-scripts/test-homebrew-build.sh --install
+
+      # Upload generated Homebrew formula (cask distribution has been disabled)
+      - name: Upload generated Homebrew files
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: homebrew-files
+          path: |
+            dist/homebrew/Formula/hookdeck.rb
+          retention-days: 7

.github/workflows/test.yml

@@ -1,9 +1,14 @@
 name: test
 
 on:
-  pull_request_target:
+  workflow_run:
+    workflows: ["Dependabot PR Check"]
+    types: 
+      - completed
+  pull_request:
     branches:
       - main
+      - next
 
 jobs:
   build-mac:
@@ -16,17 +21,18 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.18.1
+          go-version: 1.24.9
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v5
         with:
-          version: latest
+          version: v2.10.2
           args: release --skip=publish --snapshot -f .goreleaser/mac.yml --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
 
   build-linux:
     runs-on: ubuntu-latest
+    if: ${{ github.actor != 'dependabot[bot]' || github.event.workflow_run.conclusion == 'success' }}
     env:
       # https://goreleaser.com/customization/docker_manifest/
       DOCKER_CLI_EXPERIMENTAL: "enabled"
@@ -47,11 +53,11 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.18.1
+          go-version: 1.24.9
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v5
         with:
-          version: latest
+          version: v2.10.2
           args: release --skip=publish --snapshot -f .goreleaser/linux.yml --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
@@ -66,30 +72,11 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.18.1
+          go-version: 1.24.9
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v5
         with:
-          version: latest
+          version: v2.10.2
           args: release --skip=publish --snapshot -f .goreleaser/windows.yml --clean 
         env:
           GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
-
-  build-windows-npm:
-    runs-on: windows-latest
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.18.1
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
-        with:
-          version: latest
-          args: release --skip=publish --snapshot -f .goreleaser/windows-npm.yml --clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}

.gitignore

@@ -1,4 +1,5 @@
 
+completions/
 dist/
 bin/
 coverage.txt
@@ -12,3 +13,4 @@ default_cassette.yaml
 .vscode/
 __debug_bin
 node_modules/
+.env

.goreleaser/linux.yml

@@ -1,3 +1,4 @@
+version: 2
 env:
   - GO111MODULE=on
 before:
@@ -28,23 +29,25 @@ builds:
       - linux
     goarch:
       - arm64
+release:
+  prerelease: auto
+  mode: append
 changelog:
-  sort: asc
-  filters:
-    exclude:
-      - "^docs:"
-      - "^test:"
+  disable: true
 checksum:
   name_template: "{{ .ProjectName }}-linux-checksums.txt"
 snapshot:
   name_template: "{{ .Tag }}-next"
 nfpms:
-  - builds:
+  - package_name: "{{ if .Prerelease }}hookdeck-beta{{ else }}hookdeck{{ end }}"
+    file_name_template: "{{ .PackageName }}_{{ .Version }}_{{ .Arch }}"
+    builds:
       - hookdeck-linux
     vendor: Hookdeck
     homepage: https://hookdeck.com
     maintainer: Hookdeck <[email protected]>
-    description: Hookdeck CLI utility
+    description: |-
+      Hookdeck CLI utility{{ if .Prerelease }} (Beta){{ end }}
     license: Apache 2.0
     formats:
       - deb
@@ -55,8 +58,8 @@ dockers:
     ids:
       - hookdeck-linux
     image_templates:
-      - "hookdeck/hookdeck-cli:latest-amd64"
       - "hookdeck/hookdeck-cli:{{ .Tag }}-amd64"
+      - "{{ if not .Prerelease }}hookdeck/hookdeck-cli:latest-amd64{{ end }}"
     build_flag_templates:
       - "--pull"
       - "--label=org.opencontainers.image.created={{.Date}}"
@@ -71,8 +74,8 @@ dockers:
     ids:
       - hookdeck-linux-arm64
     image_templates:
-      - "hookdeck/hookdeck-cli:latest-arm64"
       - "hookdeck/hookdeck-cli:{{ .Tag }}-arm64"
+      - "{{ if not .Prerelease }}hookdeck/hookdeck-cli:latest-arm64{{ end }}"
     build_flag_templates:
       - "--pull"
       - "--label=org.opencontainers.image.created={{.Date}}"
@@ -83,11 +86,12 @@ dockers:
       - "--label=homepage=https://hookdeck.com"
       - "--platform=linux/arm64/v8"
 docker_manifests:
-  - name_template: "hookdeck/hookdeck-cli:latest"
-    image_templates:
-      - "hookdeck/hookdeck-cli:latest-amd64"
-      - "hookdeck/hookdeck-cli:latest-arm64"
   - name_template: "hookdeck/hookdeck-cli:{{ .Tag }}"
     image_templates:
       - "hookdeck/hookdeck-cli:{{ .Tag }}-amd64"
       - "hookdeck/hookdeck-cli:{{ .Tag }}-arm64"
+  - name_template: "hookdeck/hookdeck-cli:latest"
+    image_templates:
+      - "hookdeck/hookdeck-cli:latest-amd64"
+      - "hookdeck/hookdeck-cli:latest-arm64"
+    skip_push: auto