Skip to content

Commit d9bf505

Browse files
authored
Version updates for several build components (#22)
1 parent 34ae1da commit d9bf505

File tree

9 files changed

+36
-25
lines changed

9 files changed

+36
-25
lines changed

.github/workflows/main.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616

1717
steps:
1818
- name: Setup go
19-
uses: actions/setup-go@v1
19+
uses: actions/setup-go@v2
2020
with:
21-
go-version: 1.13
21+
go-version: 1.15
2222

2323
- name: Checkout code
24-
uses: actions/checkout@v1
24+
uses: actions/checkout@v2
2525

2626
- name: Build binary
2727
run: go build -o dist/retry -ldflags="-s -w -X main.version=$(git describe --tags)" .
@@ -35,12 +35,12 @@ jobs:
3535

3636
steps:
3737
- name: Setup go
38-
uses: actions/setup-go@v1
38+
uses: actions/setup-go@v2
3939
with:
40-
go-version: 1.13
40+
go-version: 1.15
4141

4242
- name: Checkout code
43-
uses: actions/checkout@v1
43+
uses: actions/checkout@v2
4444

4545
- name: Run tests
4646
run: make test
@@ -51,12 +51,12 @@ jobs:
5151

5252
steps:
5353
- name: Setup go
54-
uses: actions/setup-go@v1
54+
uses: actions/setup-go@v2
5555
with:
56-
go-version: 1.13
56+
go-version: 1.15
5757

5858
- name: Checkout code
59-
uses: actions/checkout@v1
59+
uses: actions/checkout@v2
6060

6161
- name: Lint code
6262
run: make lint

.github/workflows/release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313

1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@v1
16+
uses: actions/checkout@v2
1717

1818
- name: Setup go
19-
uses: actions/setup-go@v1
19+
uses: actions/setup-go@v2
2020
with:
21-
go-version: 1.13
21+
go-version: 1.15
2222

2323
- name: Run GoReleaser
2424
env:

.golangci.yml

+7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
linters:
22
enable-all: true
33
disable:
4+
- exhaustivestruct
5+
- goerr113
46
- gomnd
7+
- gosec
58
- lll
69
- maligned
10+
- nlreturn
11+
- testpackage
12+
- tparallel
13+
- wrapcheck
714
- wsl
815

916
issues:

.goreleaser.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ builds:
1313
- amd64
1414
- 386
1515

16+
ignore:
17+
- goos: darwin
18+
goarch: 386
19+
20+
flags:
21+
- -trimpath
22+
1623
ldflags:
1724
- -s -w
1825
- -X main.version={{.Version}}
@@ -22,7 +29,8 @@ builds:
2229

2330
hooks:
2431
pre: go mod tidy
25-
post: make compress
32+
post:
33+
- upx --best --ultra-brute "{{ .Path }}"
2634

2735
archives:
2836
- id: retry

Makefile

-4
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@ test: $(go-junit-report)
6767

6868
#### Release ####
6969

70-
.PHONY: compress
71-
compress: $(upx)
72-
$(upx) --best --ultra-brute dist/retry_*/retry*
73-
7470
.PHONY: release
7571
release: $(goreleaser)
7672
ifdef GITHUB_ACTIONS

retry/retry.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ type Spec struct {
3737
Consecutive int
3838

3939
// Invert is used to indicate that the task success status should be
40-
//reversed. Failed tasks count as successful, and vice versa.
40+
// reversed. Failed tasks count as successful, and vice versa.
4141
Invert bool
4242

4343
// Jitter is the duration range to randomly add to the Sleep time.
44-
// Sleep + [0, Jitter)
44+
// Sleep + [0, Jitter)
4545
Jitter time.Duration
4646

4747
// Sleep is the duration to pause between individual task invocations.

scripts/install-golangci-lint

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ set -eu
33

44
platform="$(uname -s)"
55
if [ "$platform" = Linux ]; then
6-
prefix=golangci-lint-1.23.8-linux-amd64
6+
prefix=golangci-lint-1.32.0-linux-amd64
77
elif [ "$platform" = Darwin ]; then
8-
prefix=golangci-lint-1.23.8-darwin-amd64
8+
prefix=golangci-lint-1.32.0-darwin-amd64
99
fi
1010

1111
cd "$(mktemp -d)" || exit 1
12-
wget -q "https://github.com/golangci/golangci-lint/releases/download/v1.23.8/${prefix}.tar.gz"
12+
wget -q "https://github.com/golangci/golangci-lint/releases/download/v1.32.0/${prefix}.tar.gz"
1313
tar -xf "${prefix}.tar.gz"
1414
mkdir -p "$(dirname "$1")"
1515
install "${prefix}/golangci-lint" "$1"

scripts/install-goreleaser

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ elif [ "$platform" = Darwin ]; then
99
fi
1010

1111
cd "$(mktemp -d)" || exit 1
12-
wget -q "https://github.com/goreleaser/goreleaser/releases/download/v0.123.3/${prefix}.tar.gz"
12+
wget -q "https://github.com/goreleaser/goreleaser/releases/download/v0.145.0/${prefix}.tar.gz"
1313
tar -xf "${prefix}.tar.gz"
1414
mkdir -p "$(dirname "$1")"
1515
install goreleaser "$1"

scripts/install-upx

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ platform="$(uname -s)"
55
if [ "$platform" = Darwin ]; then
66
HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 exec brew install upx
77
fi
8-
prefix=upx-3.94-amd64_linux
8+
prefix=upx-3.96-amd64_linux
99

1010
cd "$(mktemp -d)" || exit 1
11-
wget -q "https://github.com/upx/upx/releases/download/v3.94/${prefix}.tar.xz"
11+
wget -q "https://github.com/upx/upx/releases/download/v3.96/${prefix}.tar.xz"
1212
tar -xf "${prefix}.tar.xz"
1313
mkdir -p "$(dirname "$1")"
1414
install "${prefix}/upx" "$1"

0 commit comments

Comments
 (0)