Skip to content

Commit bcb9ae0

Browse files
committed
fix: hombrew formula deprecations (plist -> service)
1 parent 46dc4c4 commit bcb9ae0

3 files changed

Lines changed: 25 additions & 74 deletions

File tree

.github/workflows/on_push.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v3
1818
with:
1919
# so we get proper snapshot version info
2020
fetch-depth: 0
2121

2222
- name: Set up Go
23-
uses: actions/setup-go@v2
23+
uses: actions/setup-go@v4
2424
with:
25-
go-version: 1.18
25+
go-version: 1.21
2626

2727
- uses: actions/cache@v2
2828
with:
@@ -34,7 +34,7 @@ jobs:
3434
${{ runner.os }}-go-
3535
3636
- name: Run GoReleaser
37-
uses: goreleaser/goreleaser-action@v2
37+
uses: goreleaser/goreleaser-action@v4
3838
with:
3939
version: latest
4040
args: release --rm-dist --snapshot

.github/workflows/on_tag.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v3
1515

1616
- name: Set up Go
17-
uses: actions/setup-go@v2
17+
uses: actions/setup-go@v4
1818
with:
19-
go-version: 1.18
19+
go-version: 1.21
2020

2121
- uses: actions/cache@v2
2222
with:
@@ -28,7 +28,7 @@ jobs:
2828
${{ runner.os }}-go-
2929
3030
- name: Run GoReleaser
31-
uses: goreleaser/goreleaser-action@v2
31+
uses: goreleaser/goreleaser-action@v4
3232
env:
3333
GITHUB_TOKEN: ${{ secrets.TOKEN }}
3434
with:

.goreleaser.yml

Lines changed: 17 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@ builds:
1111
- darwin
1212
- windows
1313
archives:
14-
- replacements:
15-
darwin: Darwin
16-
linux: Linux
17-
windows: Windows
18-
386: i386
19-
amd64: x86_64
14+
- name_template: '{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
2015
format_overrides:
2116
- goos: windows
2217
format: zip
@@ -37,7 +32,7 @@ release:
3732
name: vproxy
3833

3934
brews:
40-
- tap:
35+
- repository:
4136
owner: jittering
4237
name: homebrew-kegs
4338

@@ -64,35 +59,13 @@ brews:
6459
- name: mkcert
6560
- name: nss
6661

67-
# Specify for packages that run as a service.
68-
# Default is empty.
69-
plist: |
70-
<?xml version="1.0" encoding="UTF-8"?>
71-
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
72-
<plist version="1.0">
73-
<dict>
74-
<key>KeepAlive</key>
75-
<dict>
76-
<key>SuccessfulExit</key>
77-
<false/>
78-
</dict>
79-
<key>Label</key>
80-
<string>#{plist_name}</string>
81-
<key>ProgramArguments</key>
82-
<array>
83-
<string>#{bin}/vproxy</string>
84-
<string>daemon</string>
85-
</array>
86-
<key>RunAtLoad</key>
87-
<true/>
88-
<key>WorkingDirectory</key>
89-
<string>#{var}</string>
90-
<key>StandardErrorPath</key>
91-
<string>#{var}/log/vproxy.log</string>
92-
<key>StandardOutPath</key>
93-
<string>#{var}/log/vproxy.log</string>
94-
</dict>
95-
</plist>
62+
service: |
63+
name: "vproxy"
64+
run: ["#{bin}/vproxy", "daemon"]
65+
keep_alive: successful_exit: false
66+
working_directory: "#{var}"
67+
log_path: "#{var}/log/vproxy.log"
68+
error_log_path: "#{var}/log/vproxy.log"
9669
9770
caveats: |
9871
To install your local root CA:
@@ -199,7 +172,7 @@ brews:
199172
end
200173
end
201174
202-
- tap:
175+
- repository:
203176
owner: jittering
204177
name: homebrew-kegs
205178

@@ -227,35 +200,13 @@ brews:
227200
- name: nss
228201
- name: go
229202

230-
# Specify for packages that run as a service.
231-
# Default is empty.
232-
plist: |
233-
<?xml version="1.0" encoding="UTF-8"?>
234-
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
235-
<plist version="1.0">
236-
<dict>
237-
<key>KeepAlive</key>
238-
<dict>
239-
<key>SuccessfulExit</key>
240-
<false/>
241-
</dict>
242-
<key>Label</key>
243-
<string>#{plist_name}</string>
244-
<key>ProgramArguments</key>
245-
<array>
246-
<string>#{bin}/vproxy</string>
247-
<string>daemon</string>
248-
</array>
249-
<key>RunAtLoad</key>
250-
<true/>
251-
<key>WorkingDirectory</key>
252-
<string>#{var}</string>
253-
<key>StandardErrorPath</key>
254-
<string>#{var}/log/vproxy.log</string>
255-
<key>StandardOutPath</key>
256-
<string>#{var}/log/vproxy.log</string>
257-
</dict>
258-
</plist>
203+
service: |
204+
name: "vproxy-head"
205+
run: ["#{bin}/vproxy", "daemon"]
206+
keep_alive: successful_exit: false
207+
working_directory: "#{var}"
208+
log_path: "#{var}/log/vproxy.log"
209+
error_log_path: "#{var}/log/vproxy.log"
259210
260211
caveats: |
261212
To install your local root CA:

0 commit comments

Comments
 (0)