Skip to content

Commit 5cd34c6

Browse files
authored
Merge branch 'main' into xlate
2 parents 3e61058 + 68daf7e commit 5cd34c6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+900
-509
lines changed

Diff for: .github/workflows/codetests.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ${{ matrix.os }}-latest
1212
steps:
1313
- uses: actions/checkout@v4
14-
- uses: actions/setup-go@v4
14+
- uses: actions/setup-go@v5
1515
with:
16-
go-version: '1.20'
16+
go-version-file: 'go.mod'
1717
- name: go-test
1818
run: go test ./pkg/...
1919

@@ -36,11 +36,11 @@ jobs:
3636
GOOS: ${{ matrix.os }}
3737
steps:
3838
- uses: actions/checkout@v4
39-
- uses: actions/setup-go@v4
39+
- uses: actions/setup-go@v5
4040
with:
41-
go-version: '1.20'
41+
go-version-file: 'go.mod'
4242
- name: golangci-lint
43-
uses: golangci/golangci-lint-action@v3
43+
uses: golangci/golangci-lint-action@v4
4444
with:
45-
version: 'v1.51'
45+
version: 'v1.57'
4646
args: --verbose ./pkg/...

Diff for: .github/workflows/release.yml

+12-11
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
# we need the whole thing so we can count commits.
2222
fetch-depth: '0'
2323
- name: Install Go
24-
uses: actions/setup-go@v4
24+
uses: actions/setup-go@v5
2525
with:
26-
go-version: '1.20'
26+
go-version-file: 'go.mod'
2727
- name: setup node
28-
uses: actions/setup-node@v3
28+
uses: actions/setup-node@v4
2929
with:
30-
node-version: '19'
30+
node-version: '20'
3131
- name: Installs Wails
3232
run: go install github.com/wailsapp/wails/v2/cmd/wails@latest
3333

@@ -59,9 +59,10 @@ jobs:
5959
APPLE_SIGNING_KEY: ${{ secrets.APPLE_SIGNING_KEY }}
6060
AC_USERNAME: ${{ secrets.AC_USERNAME }}
6161
AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
62+
AC_PROVIDER: ${{ secrets.AC_PROVIDER }}
6263
run: |
6364
wails build -m -trimpath -platform darwin/universal -webview2 embed -ldflags='${{ env.VERSION_LDFLAGS }}'
64-
brew install mitchellh/gon/gon
65+
brew install Bearer/tap/gon
6566
build/darwin/makedmg.sh
6667
6768
- name: Build Linux AMD64
@@ -137,7 +138,7 @@ jobs:
137138
gzip -9 build/bin/toolbarr.*64
138139
139140
- name: Upload Artifacts
140-
uses: actions/upload-artifact@v3
141+
uses: actions/upload-artifact@v4
141142
with:
142143
name: toolbarr-${{ matrix.platform }}
143144
path: build/bin/*
@@ -150,7 +151,7 @@ jobs:
150151
runs-on: ubuntu-latest
151152
steps:
152153
- name: Download release files
153-
uses: actions/download-artifact@v3
154+
uses: actions/download-artifact@v4
154155
with:
155156
name: toolbarr-ubuntu-latest
156157
- uses: golift/upload-packagecloud@v1
@@ -172,7 +173,7 @@ jobs:
172173
runs-on: ubuntu-latest
173174
steps:
174175
- name: "Download files: ${{ matrix.files }}"
175-
uses: actions/download-artifact@v3
176+
uses: actions/download-artifact@v4
176177
with:
177178
name: ${{ matrix.files }}
178179
- name: Upload files to unstable.golift.io
@@ -193,7 +194,7 @@ jobs:
193194
runs-on: ubuntu-latest
194195
steps:
195196
- name: Download release files
196-
uses: actions/download-artifact@v3
197+
uses: actions/download-artifact@v4
197198
with:
198199
name: toolbarr-ubuntu-latest
199200
- uses: golift/upload-packagecloud@v1
@@ -217,11 +218,11 @@ jobs:
217218
runs-on: ubuntu-latest
218219
steps:
219220
- name: Download ${{ matrix.files }} Files
220-
uses: actions/download-artifact@v3
221+
uses: actions/download-artifact@v4
221222
with:
222223
name: ${{ matrix.files }}
223224
- name: Publish ${{ matrix.files }} artifacts to github
224-
uses: softprops/action-gh-release@v1
225+
uses: softprops/action-gh-release@v2
225226
with:
226227
files: |
227228
*.rpm

Diff for: .golangci.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ linters:
2121
- containedctx
2222
- nlreturn
2323
- contextcheck
24-
# # unneeded (broken because of generics)
25-
- rowserrcheck
26-
- wastedassign
27-
- gomoddirectives # broken
24+
- depguard
25+
- perfsprint
2826
run:
2927
timeout: 5m

Diff for: LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2022-2023 Notifiarr
3+
Copyright (c) 2022-2024 Notifiarr
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)