Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,18 @@ jobs:
publish-npm:
runs-on: ubuntu-latest
needs: [build-windows, build-linux, build-mac]
permissions:
id-token: write # Required for OIDC
contents: write # For git operations
steps:
- uses: actions/checkout@v4
with:
# With permission to push to a protected branch
token: ${{ secrets.READ_WRITE_PAT }}
fetch-depth: 0 # Required to find branches for a tag
fetch-depth: 0

- 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"
Expand All @@ -109,8 +109,10 @@ jobs:
node-version: "20.x"
registry-url: "https://registry.npmjs.org"

- name: Upgrade npm to latest version
run: npm install -g npm@latest

- name: Get GitHub tag version
# Store the version, stripping any v-prefix
id: tag-version
run: |
TAG_VERSION=${GITHUB_REF_NAME#v}
Expand All @@ -128,9 +130,9 @@ jobs:
uses: EndBug/add-and-commit@v9
with:
default_author: github_actions
message: 'Update package.json version to ${{ steps.tag-version.outputs.TAG_VERSION }}'
add: 'package.json'
message: "Update package.json version to ${{ steps.tag-version.outputs.TAG_VERSION }}"
add: "package.json"

- run: npm ci

- name: Determine npm tag for pre-releases
Expand All @@ -144,6 +146,4 @@ jobs:
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 }}
- run: npm publish --provenance --tag ${{ steps.npm_tag.outputs.tag }}
6 changes: 1 addition & 5 deletions .goreleaser/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@ release:
prerelease: auto
mode: append
changelog:
sort: asc
filters:
exclude:
- "^docs:"
- "^test:"
disable: true
checksum:
name_template: "{{ .ProjectName }}-linux-checksums.txt"
snapshot:
Expand Down
6 changes: 1 addition & 5 deletions .goreleaser/mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@ release:
prerelease: auto
mode: append
changelog:
sort: asc
filters:
exclude:
- "^docs:"
- "^test:"
disable: true
checksum:
name_template: "{{ .ProjectName }}-checksums.txt"
snapshot:
Expand Down
6 changes: 1 addition & 5 deletions .goreleaser/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ release:
prerelease: auto
mode: append
changelog:
sort: asc
filters:
exclude:
- "^docs:"
- "^test:"
disable: true
checksum:
name_template: "{{ .ProjectName }}-windows-checksums.txt"
snapshot:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ require (
github.com/tidwall/pretty v1.2.1
github.com/x-cray/logrus-prefixed-formatter v0.5.2
golang.org/x/sys v0.38.0
golang.org/x/term v0.36.0
golang.org/x/term v0.37.0
)

require (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/listen.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ Examples:

hookdeck listen %[1]d shopify

Forward events to a local server running on "http://myapp.test":
Forward events to a local server running on "http://myapp.test:%[1]d":

hookdeck listen %[1]d http://myapp.test
hookdeck listen http://myapp.test:%[1]d

Forward events to the path "/webhooks" on local server running on port %[1]d:

Expand Down
Loading