Skip to content

Commit

Permalink
Rotate tests to 1.18-1.20, update 1.18 to 1.20
Browse files Browse the repository at this point in the history
* Rotate tests to 1.18-1.20, update 1.18 to 1.20

* Replace usage of deprecated goreleaser functions

* Bump goreleaser-action to v4

* Bump setup-go to v4
  • Loading branch information
denny241 authored Mar 31, 2023
1 parent 99c0bda commit 4f77774
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 21 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release-dry-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
fetch-depth: 0

- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.20'

- name: Set up Node
uses: actions/setup-node@v2
Expand All @@ -34,10 +34,10 @@ jobs:
working-directory: ./ui/desktop

- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2
uses: goreleaser/goreleaser-action@v4
with:
version: latest
args: release --snapshot --skip-publish --rm-dist
args: release --snapshot --skip-publish --clean
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
fetch-depth: 0

- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.20'

- name: Set up Node
uses: actions/setup-node@v2
Expand All @@ -30,9 +30,9 @@ jobs:
working-directory: ./ui/desktop

- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2
uses: goreleaser/goreleaser-action@v4
with:
version: latest
args: release --rm-dist
args: release --clean
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: [1.17.x, 1.18.x]
go-version: [1.18.x, 1.19.x, 1.20.x]
os: [ubuntu-latest, macos-latest, windows-latest]
tags: [cli, desktop]
runs-on: ${{ matrix.os }}
steps:
- name: Install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}

Expand Down
26 changes: 16 additions & 10 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,28 +70,34 @@ archives:
builds:
- loophole-cli
- loophole-cli-win
replacements:
amd64: 64bit
386: 32bit
darwin: macos
format_overrides:
- goos: windows
format: zip
wrap_in_directory: true
name_template: "{{ .ProjectName }}-cli_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}"
name_template: >-
{{ .ProjectName }}-cli_{{ .Version }}_
{{- if eq .Os "darwin" }}macos{{ else }}{{ title .Os }}{{ end }}_
{{- if eq .Arch "amd64" }}x86_64
{{- else if eq .Arch "386" }}i386
{{- else }}{{ .Arch }}{{ end }}
{{- if .Arm }}v{{ .Arm }}{{ end }}
{{- if .Mips }}_{{ .Mips }}{{ end }}
- id: desktop
builds:
- loophole-desktop
- loophole-desktop-win
replacements:
amd64: 64bit
386: 32bit
darwin: macos
name_template: >-
{{ .ProjectName }}-desktop_{{ .Version }}_
{{- if eq .Os "darwin" }}macos{{ else }}{{ title .Os }}{{ end }}_
{{- if eq .Arch "amd64" }}x86_64
{{- else if eq .Arch "386" }}i386
{{- else }}{{ .Arch }}{{ end }}
{{- if .Arm }}v{{ .Arm }}{{ end }}
{{- if .Mips }}_{{ .Mips }}{{ end }}
format_overrides:
- goos: windows
format: zip
wrap_in_directory: true
name_template: "{{ .ProjectName }}-desktop_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}"
checksum:
name_template: "checksums.txt"

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/loophole/cli

go 1.18
go 1.20

require (
github.com/abbot/go-http-auth v0.4.0
Expand Down

0 comments on commit 4f77774

Please sign in to comment.