Skip to content

Commit f9915ed

Browse files
authored
Merge pull request #184 from hookdeck/next
Merge for v1.4.1 release
2 parents 41dabcc + 55935f3 commit f9915ed

File tree

21 files changed

+356
-317
lines changed

21 files changed

+356
-317
lines changed

.github/workflows/release.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,18 @@ jobs:
7878
publish-npm:
7979
runs-on: ubuntu-latest
8080
needs: [build-windows, build-linux, build-mac]
81+
permissions:
82+
id-token: write # Required for OIDC
83+
contents: write # For git operations
8184
steps:
8285
- uses: actions/checkout@v4
8386
with:
84-
# With permission to push to a protected branch
8587
token: ${{ secrets.READ_WRITE_PAT }}
86-
fetch-depth: 0 # Required to find branches for a tag
88+
fetch-depth: 0
8789

8890
- name: Determine release branch
8991
id: get_branch
9092
run: |
91-
# Find the branch that contains the tag.
92-
# Prefers 'main', then 'master', then the first branch found.
9393
BRANCHES=$(git branch -r --contains ${{ github.ref_name }} | sed 's/ *origin\///' | grep -v HEAD)
9494
if echo "$BRANCHES" | grep -q -w "main"; then
9595
RELEASE_BRANCH="main"
@@ -109,8 +109,10 @@ jobs:
109109
node-version: "20.x"
110110
registry-url: "https://registry.npmjs.org"
111111

112+
- name: Upgrade npm to latest version
113+
run: npm install -g npm@latest
114+
112115
- name: Get GitHub tag version
113-
# Store the version, stripping any v-prefix
114116
id: tag-version
115117
run: |
116118
TAG_VERSION=${GITHUB_REF_NAME#v}
@@ -128,9 +130,9 @@ jobs:
128130
uses: EndBug/add-and-commit@v9
129131
with:
130132
default_author: github_actions
131-
message: 'Update package.json version to ${{ steps.tag-version.outputs.TAG_VERSION }}'
132-
add: 'package.json'
133-
133+
message: "Update package.json version to ${{ steps.tag-version.outputs.TAG_VERSION }}"
134+
add: "package.json"
135+
134136
- run: npm ci
135137

136138
- name: Determine npm tag for pre-releases
@@ -144,6 +146,4 @@ jobs:
144146
echo "tag=${NPM_TAG}" >> $GITHUB_OUTPUT
145147
echo "npm tag: ${NPM_TAG}"
146148
147-
- run: npm publish --tag ${{ steps.npm_tag.outputs.tag }}
148-
env:
149-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
149+
- run: npm publish --provenance --tag ${{ steps.npm_tag.outputs.tag }}

.goreleaser/linux.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@ release:
3333
prerelease: auto
3434
mode: append
3535
changelog:
36-
sort: asc
37-
filters:
38-
exclude:
39-
- "^docs:"
40-
- "^test:"
36+
disable: true
4137
checksum:
4238
name_template: "{{ .ProjectName }}-linux-checksums.txt"
4339
snapshot:

.goreleaser/mac.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@ release:
3232
prerelease: auto
3333
mode: append
3434
changelog:
35-
sort: asc
36-
filters:
37-
exclude:
38-
- "^docs:"
39-
- "^test:"
35+
disable: true
4036
checksum:
4137
name_template: "{{ .ProjectName }}-checksums.txt"
4238
snapshot:

.goreleaser/windows.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@ release:
2828
prerelease: auto
2929
mode: append
3030
changelog:
31-
sort: asc
32-
filters:
33-
exclude:
34-
- "^docs:"
35-
- "^test:"
31+
disable: true
3632
checksum:
3733
name_template: "{{ .ProjectName }}-windows-checksums.txt"
3834
snapshot:

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/tidwall/pretty v1.2.1
2424
github.com/x-cray/logrus-prefixed-formatter v0.5.2
2525
golang.org/x/sys v0.38.0
26-
golang.org/x/term v0.36.0
26+
golang.org/x/term v0.37.0
2727
)
2828

2929
require (

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
197197
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
198198
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
199199
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
200-
golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
201-
golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
200+
golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
201+
golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
202202
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
203203
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
204204
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
66
You may obtain a copy of the License at
77
8-
http://www.apache.org/licenses/LICENSE-2.0
8+
http://www.apache.org/licenses/LICENSE-2.0
99
1010
Unless required by applicable law or agreed to in writing, software
1111
distributed under the License is distributed on an "AS IS" BASIS,

pkg/cmd/listen.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,9 @@ Examples:
185185
186186
hookdeck listen %[1]d shopify
187187
188-
Forward events to a local server running on "http://myapp.test":
188+
Forward events to a local server running on "http://myapp.test:%[1]d":
189189
190-
hookdeck listen %[1]d http://myapp.test
190+
hookdeck listen http://myapp.test:%[1]d
191191
192192
Forward events to the path "/webhooks" on local server running on port %[1]d:
193193

0 commit comments

Comments
 (0)