Skip to content

Commit

Permalink
Merge branch 'main' into usage-metrics
Browse files Browse the repository at this point in the history
  • Loading branch information
mmetc committed Jul 18, 2024
2 parents 865eded + 29c7696 commit ad49f4a
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-binary-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.9
go-version: 1.22.5

- name: Build all platforms
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.9
go-version: 1.22.5

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
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@v5
with:
go-version: 1.21.9
go-version: 1.22.5

- name: Build
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_deb.yml
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@v5
with:
go-version: 1.21.9
go-version: 1.22.5

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

GO = go
GOBUILD = $(GO) build
GOTEST = $(GO) test
Expand Down Expand Up @@ -64,7 +61,7 @@ clean: clean-release-dir clean-debian clean-rpm
#

.PHONY: binary
binary: goversion
binary:
$(GOBUILD) $(LD_OPTS) -o $(BINARY_NAME)

.PHONY: build
Expand All @@ -79,7 +76,7 @@ lint:
golangci-lint run

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

.PHONY: func-tests
Expand Down Expand Up @@ -133,7 +130,5 @@ release: clean tarball
#

.PHONY: platform-all
platform-all: goversion clean
platform-all: clean
python3 .github/release.py run-build $(BINARY_NAME)

include mk/goversion.mk
31 changes: 0 additions & 31 deletions mk/goversion.mk

This file was deleted.

0 comments on commit ad49f4a

Please sign in to comment.