Skip to content

Commit

Permalink
Update ci to the same go version
Browse files Browse the repository at this point in the history
Updating kustomize to a version without excludes in its go.mod
  • Loading branch information
zerbitx committed Jul 13, 2023
1 parent f80475f commit 0872281
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
IMAGE_BASE: docker.cloudsmith.io/streamnative/operators/flink-operator

steps:
- name: Set up Go 1.16
- name: Set up Go 1.18
uses: actions/setup-go@v1
with:
go-version: 1.16
go-version: 1.18
id: go

- name: Check out code into the Go module directory
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.builder
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ FROM ubuntu:20.04
RUN apt update && apt install -yqq curl git make gcc

# Install Go
RUN curl -s https://dl.google.com/go/go1.16.13.linux-amd64.tar.gz | tar -xz -C /usr/local/
RUN curl -s https://dl.google.com/go/go1.18.10.linux-amd64.tar.gz | tar -xz -C /usr/local/
ENV GOROOT=/usr/local/go
ENV PATH=${PATH}:${GOROOT}/bin

Expand All @@ -30,6 +30,7 @@ COPY go.sum go.sum

# Cache deps before building so that we don't need to re-download as much
# and so that source changes don't invalidate our downloaded layer.
RUN go mod tidy
RUN go mod download

# Copy the project source code
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ controller-gen: ## Download controller-gen locally if necessary.

KUSTOMIZE = $(shell pwd)/bin/kustomize
kustomize: ## Download kustomize locally if necessary.
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v3@v3.8.7)
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v4@v4.5.2)

# go-get-tool will 'go get' any package $2 and install it to $1.
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
Expand Down

0 comments on commit 0872281

Please sign in to comment.