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.

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

Run make copyfrommakego and drop Dockerfile.workspace #3577

Merged
merged 1 commit into from
Jan 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 0 additions & 36 deletions Dockerfile.workspace

This file was deleted.

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

# Settable
# https://github.com/bufbuild/buf/releases 20241219 checked 20241219
BUF_VERSION ?= v1.48.0
# https://github.com/bufbuild/buf/releases 20250107 checked 20250107
BUF_VERSION ?= v1.49.0
# Settable
#
# If set, this path will be installed every time someone depends on $(BUF)
Expand Down
4 changes: 2 additions & 2 deletions make/go/dep_golangci_lint.mk
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ $(call _assert_var,CACHE_BIN)
GOLANGCI_LINT_GO_VERSION := $(shell go list -m -f '{{.GoVersion}}' | cut -d'.' -f1-2)

# Settable
# https://github.com/golangci/golangci-lint/releases 20241110 checked 20241113
# https://github.com/golangci/golangci-lint/releases 20250102 checked 20250102
# Contrast golangci-lint configuration with the one in https://github.com/connectrpc/connect-go/blob/main/.golangci.yml when upgrading
GOLANGCI_LINT_VERSION ?= v1.62.0
GOLANGCI_LINT_VERSION ?= v1.63.2

GOLANGCI_LINT := $(CACHE_VERSIONS)/golangci-lint/$(GOLANGCI_LINT_VERSION)-go$(GOLANGCI_LINT_GO_VERSION)
$(GOLANGCI_LINT):
Expand Down
21 changes: 0 additions & 21 deletions make/go/docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,11 @@ $(call _assert_var,DOCKER_ORG)
# Must be set
$(call _assert_var,DOCKER_PROJECT)

DOCKER_WORKSPACE_IMAGE := $(DOCKER_ORG)/$(DOCKER_PROJECT)-workspace
DOCKER_WORKSPACE_FILE := Dockerfile.workspace
DOCKER_WORKSPACE_DIR := /workspace

# Settable
DOCKER_BINS ?=
# Settable
DOCKER_BUILD_EXTRA_FLAGS ?=

# Runtime
DOCKERMAKETARGET ?= all

.PHONY: dockerbuildworkspace
dockerbuildworkspace:
docker build \
$(DOCKER_BUILD_EXTRA_FLAGS) \
--build-arg PROJECT=$(PROJECT) \
--build-arg GO_MODULE=$(GO_MODULE) \
-t $(DOCKER_WORKSPACE_IMAGE) \
-f $(DOCKER_WORKSPACE_FILE) \
.

.PHONY: dockermakeworkspace
dockermakeworkspace: dockerbuildworkspace
docker run -v "$(CURDIR):$(DOCKER_WORKSPACE_DIR)" $(DOCKER_WORKSPACE_IMAGE) make -j 8 $(DOCKERMAKETARGET)

.PHONY: dockerbuild
dockerbuild::

Expand Down
Loading