Skip to content

update makego #82

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

Open
konradjniemiec wants to merge 2 commits into
base: main
Choose a base branch
from
Open

update makego #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28fed9c
update makego
konradjniemiec Nov 29, 2022
5f13adc
gen code
konradjniemiec Dec 6, 2022
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
23 changes: 0 additions & 23 deletions make/go/dep_go_fuzz.mk
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions make/go/dep_golangci_lint.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ $(call _assert_var,CACHE_VERSIONS)
$(call _assert_var,CACHE_BIN)

# Settable
# https://github.com/golangci/golangci-lint/releases 20220517 checked 20220520
# https://github.com/golangci/golangci-lint/releases 20220824 checked 20220920
# Check for new linters and add to .golangci.yml (even if commented out) when upgrading
GOLANGCI_LINT_VERSION ?= v1.46.2
GOLANGCI_LINT_VERSION ?= v1.49.0

GOLANGCI_LINT := $(CACHE_VERSIONS)/golangci-lint/$(GOLANGCI_LINT_VERSION)
$(GOLANGCI_LINT):
Expand Down
4 changes: 2 additions & 2 deletions make/go/dep_protoc.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ $(call _assert_var,CACHE_INCLUDE)
$(call _assert_var,CACHE_BIN)

# Settable
# https://github.com/protocolbuffers/protobuf/releases 20220525 checked 20220526
PROTOC_VERSION ?= 21.0
# https://github.com/protocolbuffers/protobuf/releases 20220929 checked 20220930
PROTOC_VERSION ?= 21.7

ifeq ($(UNAME_OS),Darwin)
PROTOC_OS := osx
Expand Down
7 changes: 5 additions & 2 deletions make/go/dep_protoc_gen_connect_go.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ $(call _assert_var,CACHE_VERSIONS)
$(call _assert_var,CACHE_BIN)

# Settable
# https://github.com/bufbuild/connect-go 20220531 checked 20220601
CONNECT_VERSION ?= v0.1.0
# https://github.com/bufbuild/connect-go 20221018 checked 20221024
CONNECT_VERSION ?= v1.1.0

GO_GET_PKGS := $(GO_GET_PKGS) \
github.com/bufbuild/connect-go@$(CONNECT_VERSION)

PROTOC_GEN_CONNECT_GO := $(CACHE_VERSIONS)/connect-go/$(CONNECT_VERSION)
$(PROTOC_GEN_CONNECT_GO):
Expand Down
7 changes: 5 additions & 2 deletions make/go/dep_protoc_gen_go.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ $(call _assert_var,CACHE_VERSIONS)
$(call _assert_var,CACHE_BIN)

# Settable
# https://github.com/protocolbuffers/protobuf-go/releases 20220322 checked 20220517
PROTOC_GEN_GO_VERSION ?= v1.28.0
# https://github.com/protocolbuffers/protobuf-go/releases 20220831 checked 20221004
# NOTE: This is temporary until the following fix is available in a release:
# https://github.com/protocolbuffers/protobuf-go/commit/692f4a24f8dc0d375508fc41e657920d411b5b68
PROTOC_GEN_GO_VERSION ?= v1.28.2-0.20220831092852-f930b1dc76e8


GO_GET_PKGS := $(GO_GET_PKGS) \
google.golang.org/protobuf/proto@$(PROTOC_GEN_GO_VERSION)
Expand Down
9 changes: 7 additions & 2 deletions make/go/docker.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ DOCKERMAKETARGET ?= all

.PHONY: dockerbuildworkspace
dockerbuildworkspace:
docker build \
docker buildx build \
$(DOCKER_BUILD_EXTRA_FLAGS) \
--build-arg PROJECT=$(PROJECT) \
--build-arg GO_MODULE=$(GO_MODULE) \
Expand All @@ -38,6 +38,11 @@ dockerbuildworkspace:
dockermakeworkspace: dockerbuildworkspace
docker run -v "$(CURDIR):$(DOCKER_WORKSPACE_DIR)" $(DOCKER_WORKSPACE_IMAGE) make -j 8 $(DOCKERMAKETARGET)

# To build for amd64 machines (in prod): `make dockerbuild amd64`
ifneq (,$(findstring amd64,$(MAKECMDGOALS)))
DOCKER_BUILD_EXTRA_FLAGS=--platform=linux/amd64
endif

.PHONY: dockerbuild
dockerbuild:: govendor

Expand All @@ -47,7 +52,7 @@ dockerbuilddeps$(1)::

.PHONY: dockerbuild$(1)
dockerbuild$(1): dockerbuilddeps$(1)
docker build $(DOCKER_BUILD_EXTRA_FLAGS) -t $(DOCKER_ORG)/$(1):latest -f Dockerfile.$(1) .
docker buildx build $(DOCKER_BUILD_EXTRA_FLAGS) -t $(DOCKER_ORG)/$(1):latest -f Dockerfile.$(1) .
ifdef EXTRA_DOCKER_ORG
docker tag $(DOCKER_ORG)/$(1):latest $(EXTRA_DOCKER_ORG)/$(1):latest
endif
Expand Down
2 changes: 1 addition & 1 deletion pkg/gen/proto/go/lekko/backend/v1beta1/configuration_service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/gen/proto/go/lekko/backend/v1beta1/distribution_service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/gen/proto/go/lekko/feature/v1beta1/feature.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/gen/proto/go/lekko/rules/v1beta2/rules.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.