Skip to content

Commit d1160ef

Browse files
authored
Merge pull request #740 from danielpaulus/chore/bump-deprecated-gha-node20
chore(ci): refresh GitHub Actions + bump Go to 1.26
2 parents 3661ad6 + 1a4ac59 commit d1160ef

14 files changed

Lines changed: 55 additions & 80 deletions

File tree

.githooks/pre-commit

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
#!/bin/sh
22
# Pre-commit hook for go-ios
3-
# Runs gofmt and golangci-lint before allowing commits
3+
# Runs gofmt and go vet before allowing commits
44

55
set -e
66

77
echo "Running pre-commit checks..."
88

9-
# Check if golangci-lint is installed
10-
if ! command -v golangci-lint &> /dev/null; then
11-
echo "Error: golangci-lint is not installed."
12-
echo "Install it with: brew install golangci-lint"
13-
echo "Or see: https://golangci-lint.run/docs/welcome/install/"
14-
exit 1
15-
fi
16-
179
# Check formatting
1810
echo "Checking code formatting..."
1911
UNFORMATTED=$(gofmt -l .)
@@ -25,11 +17,10 @@ if [ -n "$UNFORMATTED" ]; then
2517
exit 1
2618
fi
2719

28-
# Run linter
29-
echo "Running golangci-lint..."
30-
golangci-lint run
31-
if [ $? -ne 0 ]; then
32-
echo "Error: Linter found issues. Please fix them before committing."
20+
# Run go vet
21+
echo "Running go vet..."
22+
if ! go vet ./...; then
23+
echo "Error: go vet found issues. Please fix them before committing."
3324
exit 1
3425
fi
3526

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: self-hosted
99

1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v6
1212

1313
- name: Extract ngrok url
1414
run: |
@@ -25,7 +25,7 @@ jobs:
2525
environment: staging
2626

2727
- name: Install Go
28-
uses: actions/setup-go@v3
28+
uses: actions/setup-go@v6
2929
with:
3030
go-version-file: go.mod
3131
cache: true

.github/workflows/device-tests-comment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
pull-requests: write
2727
steps:
2828
- name: Acknowledge the command
29-
uses: actions/github-script@v7
29+
uses: actions/github-script@v9
3030
with:
3131
script: |
3232
await github.rest.reactions.createForIssueComment({
@@ -59,7 +59,7 @@ jobs:
5959
issues: write
6060
pull-requests: write
6161
steps:
62-
- uses: actions/github-script@v7
62+
- uses: actions/github-script@v9
6363
with:
6464
script: |
6565
const ok = '${{ needs.real-device.result }}' === 'success';

.github/workflows/real-device.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ jobs:
3434
tunnel_devices: GO_IOS_E2E_LINUX_TUNNEL_DEVICES
3535
runs-on: [self-hosted, "${{ matrix.os }}"]
3636
steps:
37-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v6
3838
with:
3939
ref: ${{ inputs.ref }}
4040

4141
- name: Install Go
42-
uses: actions/setup-go@v5
42+
uses: actions/setup-go@v6
4343
with:
4444
go-version-file: go.mod
4545
cache: false

.github/workflows/release-canary.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
build_on_windows:
1515
runs-on: windows-latest
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v6
1818

1919
- name: Install Go
20-
uses: actions/setup-go@v3
20+
uses: actions/setup-go@v6
2121
with:
2222
go-version-file: go.mod
2323
cache: true
@@ -30,7 +30,7 @@ jobs:
3030
Compress-Archive -Path .\bin\ios.exe -CompressionLevel Optimal -DestinationPath go-ios-windows.zip
3131
3232
- name: upload the windows build
33-
uses: actions/upload-artifact@v4
33+
uses: actions/upload-artifact@v7
3434
with:
3535
name: windows-build
3636
path: go-ios-windows.zip
@@ -41,10 +41,10 @@ jobs:
4141
runs-on: macos-latest
4242
needs: build_on_windows
4343
steps:
44-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v6
4545

4646
- name: Install Go
47-
uses: actions/setup-go@v3
47+
uses: actions/setup-go@v6
4848
with:
4949
go-version-file: go.mod
5050
cache: true
@@ -60,7 +60,7 @@ jobs:
6060
zip -j go-ios-mac.zip bin/ios
6161
6262
- name: upload the macos build
63-
uses: actions/upload-artifact@v4
63+
uses: actions/upload-artifact@v7
6464
with:
6565
name: macos-build
6666
path: go-ios-mac.zip
@@ -75,16 +75,16 @@ jobs:
7575
# publishing. No contents: write here — canary does not cut a GitHub release.
7676
id-token: write
7777
steps:
78-
- uses: actions/checkout@v3
78+
- uses: actions/checkout@v6
7979

8080
- name: Install Go
81-
uses: actions/setup-go@v3
81+
uses: actions/setup-go@v6
8282
with:
8383
go-version-file: go.mod
8484
cache: true
8585

8686
- name: Download mac build from previous job
87-
uses: actions/download-artifact@v4
87+
uses: actions/download-artifact@v8
8888
with:
8989
name: macos-build
9090
path: ./mac-bin
@@ -95,7 +95,7 @@ jobs:
9595
unzip go-ios-mac.zip
9696
9797
- name: Download windows build from previous job
98-
uses: actions/download-artifact@v4
98+
uses: actions/download-artifact@v8
9999
with:
100100
name: windows-build
101101
path: ./win-bin
@@ -114,7 +114,7 @@ jobs:
114114
115115
# OIDC trusted publishing needs Node >= 22.14.0 and npm >= 11.5.1.
116116
- name: Set up Node
117-
uses: actions/setup-node@v4
117+
uses: actions/setup-node@v6
118118
with:
119119
node-version: '22'
120120
registry-url: 'https://registry.npmjs.org'
@@ -156,7 +156,7 @@ jobs:
156156
runs-on: ${{ matrix.os }}
157157
steps:
158158
- name: Set up Node
159-
uses: actions/setup-node@v4
159+
uses: actions/setup-node@v6
160160
with:
161161
node-version: '22'
162162
registry-url: 'https://registry.npmjs.org'

.github/workflows/release.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
outputs:
3939
version: ${{ steps.compute.outputs.version }}
4040
steps:
41-
- uses: actions/checkout@v3
41+
- uses: actions/checkout@v6
4242
with:
4343
ref: main
4444
fetch-depth: 0 # need all tags to find the latest
@@ -63,10 +63,10 @@ jobs:
6363
runs-on: windows-latest
6464
needs: prepare_version
6565
steps:
66-
- uses: actions/checkout@v3
66+
- uses: actions/checkout@v6
6767

6868
- name: Install Go
69-
uses: actions/setup-go@v3
69+
uses: actions/setup-go@v6
7070
with:
7171
go-version-file: go.mod
7272
cache: true
@@ -79,7 +79,7 @@ jobs:
7979
Compress-Archive -Path .\bin\ios.exe -CompressionLevel Optimal -DestinationPath go-ios-windows.zip
8080
8181
- name: upload the windows build
82-
uses: actions/upload-artifact@v4
82+
uses: actions/upload-artifact@v7
8383
with:
8484
name: windows-build
8585
path: go-ios-windows.zip
@@ -90,10 +90,10 @@ jobs:
9090
runs-on: macos-latest
9191
needs: [prepare_version, build_on_windows]
9292
steps:
93-
- uses: actions/checkout@v3
93+
- uses: actions/checkout@v6
9494

9595
- name: Install Go
96-
uses: actions/setup-go@v3
96+
uses: actions/setup-go@v6
9797
with:
9898
go-version-file: go.mod
9999
cache: true
@@ -109,7 +109,7 @@ jobs:
109109
zip -j go-ios-mac.zip bin/ios
110110
111111
- name: upload the macos build
112-
uses: actions/upload-artifact@v4
112+
uses: actions/upload-artifact@v7
113113
with:
114114
name: macos-build
115115
path: go-ios-mac.zip
@@ -125,26 +125,26 @@ jobs:
125125
env:
126126
VERSION: ${{ needs.prepare_version.outputs.version }}
127127
steps:
128-
- uses: actions/checkout@v3
128+
- uses: actions/checkout@v6
129129
with:
130130
ref: main
131131
fetch-depth: 0
132132
token: ${{ secrets.RELEASE_PAT }} # admin token, can push to protected main
133133

134134
- name: Install Go
135-
uses: actions/setup-go@v3
135+
uses: actions/setup-go@v6
136136
with:
137137
go-version-file: go.mod
138138
cache: true
139139

140140
- name: Download mac build from previous job
141-
uses: actions/download-artifact@v4
141+
uses: actions/download-artifact@v8
142142
with:
143143
name: macos-build
144144
path: ./mac-bin
145145

146146
- name: Download windows build from previous job
147-
uses: actions/download-artifact@v4
147+
uses: actions/download-artifact@v8
148148
with:
149149
name: windows-build
150150
path: ./win-bin
@@ -203,7 +203,7 @@ jobs:
203203
204204
# OIDC trusted publishing needs Node >= 22.14.0 and npm >= 11.5.1.
205205
- name: Set up Node
206-
uses: actions/setup-node@v4
206+
uses: actions/setup-node@v6
207207
with:
208208
node-version: '22'
209209
registry-url: 'https://registry.npmjs.org'
@@ -242,7 +242,7 @@ jobs:
242242
runs-on: ${{ matrix.os }}
243243
steps:
244244
- name: Set up Node
245-
uses: actions/setup-node@v4
245+
uses: actions/setup-node@v6
246246
with:
247247
node-version: '22'
248248
registry-url: 'https://registry.npmjs.org'

.github/workflows/test.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,26 @@ jobs:
66
lint:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v6
1010

1111
- name: Install Go
12-
uses: actions/setup-go@v5
12+
uses: actions/setup-go@v6
1313
with:
1414
go-version-file: go.mod
1515

1616
- name: Install libusb
1717
run: sudo apt-get update && sudo apt-get install -y libusb-1.0-0-dev
1818

19-
- name: Run golangci-lint
20-
uses: golangci/golangci-lint-action@v9
21-
with:
22-
version: v2.6
19+
- name: Run go vet
20+
run: go vet ./...
2321

2422
test_on_windows:
2523
runs-on: windows-latest
2624
steps:
27-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v6
2826

2927
- name: Install Go
30-
uses: actions/setup-go@v3
28+
uses: actions/setup-go@v6
3129
with:
3230
go-version-file: go.mod
3331
cache: true
@@ -44,10 +42,10 @@ jobs:
4442
test_on_linux:
4543
runs-on: ubuntu-latest
4644
steps:
47-
- uses: actions/checkout@v3
45+
- uses: actions/checkout@v6
4846

4947
- name: Install Go
50-
uses: actions/setup-go@v3
48+
uses: actions/setup-go@v6
5149
with:
5250
go-version-file: go.mod
5351
cache: true

.golangci.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ up: build run
3232

3333
# Run linter
3434
lint:
35-
@golangci-lint run
35+
@go vet ./...
3636

3737
# Setup development environment (installs git hooks)
3838
setup:

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/danielpaulus/go-ios
22

3-
go 1.24.0
3+
go 1.26.0
44

5-
toolchain go1.24.13
5+
toolchain go1.26.4
66

77
require (
88
github.com/Masterminds/semver v1.5.0

0 commit comments

Comments
 (0)