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

tools: update go and add goyacc and drone-cli #3979

Closed
wants to merge 2 commits into from
Closed

tools: update go and add goyacc and drone-cli #3979

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
b438682
tools: update go and add goyacc and drone-cli
electron0zero Aug 19, 2024
7d0ac54
WIP - don't merge this??
electron0zero Aug 19, 2024
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
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ gen-proto: ## Generate proto files
##@ Gen Traceql

.PHONY: gen-traceql
gen-traceql: ## Generate traceql
docker run --rm -v${PWD}:/src/loki ${LOKI_BUILD_IMAGE} gen-traceql-local
gen-traceql: ## Generate traceql
$(TOOLS_CMD) $(MAKE) gen-traceql-local

.PHONY: gen-traceql-local
gen-traceql-local: ## Generate traceq local
Expand All @@ -295,7 +295,7 @@ vendor-check: gen-proto update-mod gen-traceql gen-parquet-query ## Keep up to d


### Tidy dependencies for tempo and tempo-serverless modules
.PHONY: update-mod
.PHONY: update-mod
update-mod: tools-update-mod ## Update module
go mod vendor
go mod tidy -e
Expand Down Expand Up @@ -359,7 +359,7 @@ drone: ## Run Drone targets
# piggyback on Loki's build image, this image contains a newer version of drone-cli than is
# released currently (1.4.0). The newer version of drone-clie keeps drone.yml human-readable.
# This will run 'make drone-jsonnet' from within the container
docker run -e DRONE_SERVER -e DRONE_TOKEN --rm -v $(shell pwd):/src/loki ${LOKI_BUILD_IMAGE} drone-jsonnet drone-signature
docker run -e DRONE_SERVER -e DRONE_TOKEN --rm -v $(shell pwd):/tools $(TOOLS_IMAGE):$(TOOLS_IMAGE_TAG) $(MAKE) drone-jsonnet drone-signature

drone lint .drone/drone.yml --trusted

Expand Down
6 changes: 6 additions & 0 deletions tools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
FROM golang:1.23.0-bookworm AS drone
ARG TARGETARCH
RUN curl -L "https://github.com/drone/drone-cli/releases/download/v1.7.0/drone_linux_$TARGETARCH".tar.gz | tar zx && \
install -t /usr/local/bin drone

FROM golang:alpine

ARG TARGETOS
Expand All @@ -7,6 +12,7 @@ RUN apk --update add --no-cache make git bash

WORKDIR /tools
COPY tools /tools
COPY --from=drone /usr/local/bin/drone /usr/bin/drone
RUN /tools/install.sh
COPY tools/entrypoint.sh /bin/entrypoint.sh
ENTRYPOINT [ "/bin/entrypoint.sh" ]
1 change: 1 addition & 0 deletions tools/tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
_ "github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb"
_ "github.com/psampaz/go-mod-outdated"
_ "golang.org/x/tools/cmd/goimports"
_ "golang.org/x/tools/cmd/goyacc"
_ "gotest.tools/gotestsum"
_ "mvdan.cc/gofumpt"
)
Loading