Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build with go 1.20.4 #64

Merged
merged 1 commit into from
May 4, 2023
Merged

Build with go 1.20.4 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-binary-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.20.3
go-version: 1.20.4

- name: Build all versions
run: |
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ permissions:

jobs:
build:
strategy:
matrix:
go-version: ["1.20.3"]

name: "Build + tests"
runs-on: ubuntu-latest

Expand All @@ -25,10 +21,10 @@ jobs:
with:
fetch-depth: 0

- name: Set up Go ${{ matrix.go-version }}
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
go-version: 1.20.4

- name: Build
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_deb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.20.3
go-version: 1.20.4

- name: Cache virtualenvs
id: cache-pipenv
Expand Down
10 changes: 6 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
BUILD_REQUIRE_GO_MAJOR ?= 1
BUILD_REQUIRE_GO_MINOR ?= 20

GOCMD=go
GOBUILD=$(GOCMD) build
GOTEST=$(GOCMD) test
Expand Down Expand Up @@ -57,7 +60,7 @@ binary: goversion
$(GOBUILD) $(LD_OPTS) $(BUILD_VENDOR_FLAGS) -o $(BINARY_NAME)

.PHONY: build
build: goversion clean binary
build: clean binary

#
# Unit and integration tests
Expand All @@ -68,7 +71,7 @@ lint:
golangci-lint run

.PHONY: test
test:
test: goversion
@$(GOTEST) $(LD_OPTS) ./...

.PHONY: func-tests
Expand All @@ -82,7 +85,7 @@ func-tests: build

RELDIR = $(BINARY_NAME)-$(BUILD_VERSION)

# Called during release, to reuse the directory for other platforms
# Called during platform-all, to reuse the directory for other platforms
.PHONY: clean-release-dir
clean-release-dir:
@$(RM) -r $(RELDIR)
Expand Down Expand Up @@ -114,5 +117,4 @@ release: clean tarball
platform-all: goversion clean
python3 .github/release.py run-build $(BINARY_NAME)

# Check if go is the right version
include mk/goversion.mk
4 changes: 0 additions & 4 deletions mk/goversion.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@

BUILD_REQUIRE_GO_MAJOR ?= 1
BUILD_REQUIRE_GO_MINOR ?= 20

BUILD_GOVERSION = $(subst go,,$(shell go env GOVERSION))

go_major_minor = $(subst ., ,$(BUILD_GOVERSION))
Expand Down