Skip to content

Commit 34948da

Browse files
authored
Build with go 1.20.4 (#64)
1 parent 227460e commit 34948da

File tree

5 files changed

+10
-16
lines changed

5 files changed

+10
-16
lines changed

.github/workflows/build-binary-package.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Set up Go
2727
uses: actions/setup-go@v4
2828
with:
29-
go-version: 1.20.3
29+
go-version: 1.20.4
3030

3131
- name: Build all versions
3232
run: |

.github/workflows/tests.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ permissions:
1111

1212
jobs:
1313
build:
14-
strategy:
15-
matrix:
16-
go-version: ["1.20.3"]
17-
1814
name: "Build + tests"
1915
runs-on: ubuntu-latest
2016

@@ -25,10 +21,10 @@ jobs:
2521
with:
2622
fetch-depth: 0
2723

28-
- name: Set up Go ${{ matrix.go-version }}
24+
- name: Set up Go
2925
uses: actions/setup-go@v4
3026
with:
31-
go-version: ${{ matrix.go-version }}
27+
go-version: 1.20.4
3228

3329
- name: Build
3430
run: |

.github/workflows/tests_deb.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Set up Go
2525
uses: actions/setup-go@v4
2626
with:
27-
go-version: 1.20.3
27+
go-version: 1.20.4
2828

2929
- name: Cache virtualenvs
3030
id: cache-pipenv

Makefile

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
BUILD_REQUIRE_GO_MAJOR ?= 1
2+
BUILD_REQUIRE_GO_MINOR ?= 20
3+
14
GOCMD=go
25
GOBUILD=$(GOCMD) build
36
GOTEST=$(GOCMD) test
@@ -57,7 +60,7 @@ binary: goversion
5760
$(GOBUILD) $(LD_OPTS) $(BUILD_VENDOR_FLAGS) -o $(BINARY_NAME)
5861

5962
.PHONY: build
60-
build: goversion clean binary
63+
build: clean binary
6164

6265
#
6366
# Unit and integration tests
@@ -68,7 +71,7 @@ lint:
6871
golangci-lint run
6972

7073
.PHONY: test
71-
test:
74+
test: goversion
7275
@$(GOTEST) $(LD_OPTS) ./...
7376

7477
.PHONY: func-tests
@@ -82,7 +85,7 @@ func-tests: build
8285

8386
RELDIR = $(BINARY_NAME)-$(BUILD_VERSION)
8487

85-
# Called during release, to reuse the directory for other platforms
88+
# Called during platform-all, to reuse the directory for other platforms
8689
.PHONY: clean-release-dir
8790
clean-release-dir:
8891
@$(RM) -r $(RELDIR)
@@ -114,5 +117,4 @@ release: clean tarball
114117
platform-all: goversion clean
115118
python3 .github/release.py run-build $(BINARY_NAME)
116119

117-
# Check if go is the right version
118120
include mk/goversion.mk

mk/goversion.mk

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
2-
BUILD_REQUIRE_GO_MAJOR ?= 1
3-
BUILD_REQUIRE_GO_MINOR ?= 20
4-
51
BUILD_GOVERSION = $(subst go,,$(shell go env GOVERSION))
62

73
go_major_minor = $(subst ., ,$(BUILD_GOVERSION))

0 commit comments

Comments
 (0)