Skip to content

Commit 83876cf

Browse files
authored
updating to go 1.23 and UBI 9.5 (#122)
Signed-off-by: Adam D. Cornett <[email protected]>
1 parent bef914f commit 83876cf

File tree

7 files changed

+211
-12
lines changed

7 files changed

+211
-12
lines changed

.bingo/Variables.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ $(BINGO): $(BINGO_DIR)/bingo.mod
2323
@echo "(re)installing $(GOBIN)/bingo-v0.9.0"
2424
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.9.0 "github.com/bwplotka/bingo"
2525

26-
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.55.2
26+
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.62.2
2727
$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
2828
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
29-
@echo "(re)installing $(GOBIN)/golangci-lint-v1.55.2"
30-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.55.2 "github.com/golangci/golangci-lint/cmd/golangci-lint"
29+
@echo "(re)installing $(GOBIN)/golangci-lint-v1.62.2"
30+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.62.2 "github.com/golangci/golangci-lint/cmd/golangci-lint"
3131

3232
GORELEASER := $(GOBIN)/goreleaser-v1.16.2
3333
$(GORELEASER): $(BINGO_DIR)/goreleaser.mod

.bingo/golangci-lint.mod

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

3-
go 1.21.3
3+
go 1.22.1
44

5-
require github.com/golangci/golangci-lint v1.55.2 // cmd/golangci-lint
5+
toolchain go1.22.5
6+
7+
require github.com/golangci/golangci-lint v1.62.2 // cmd/golangci-lint

.bingo/golangci-lint.sum

Lines changed: 199 additions & 0 deletions
Large diffs are not rendered by default.

.bingo/variables.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fi
1010

1111
BINGO="${GOBIN}/bingo-v0.9.0"
1212

13-
GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.55.2"
13+
GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.62.2"
1414

1515
GORELEASER="${GOBIN}/goreleaser-v1.16.2"
1616

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/operator-framework/ansible-operator-plugins
22

3-
go 1.22.5
4-
5-
toolchain go1.22.8
3+
go 1.23.4
64

75
require (
86
github.com/go-logr/logr v1.4.2

images/ansible-operator/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# It is built with dependencies that take a while to download, thus speeding
33
# up ansible deploy jobs.
44

5-
FROM registry.access.redhat.com/ubi9/ubi:9.4-1214.1726694543 AS basebuilder
5+
FROM registry.access.redhat.com/ubi9/ubi:9.5 AS basebuilder
66

77
# Install Rust so that we can ensure backwards compatibility with installing/building the cryptography wheel across all platforms
88
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
@@ -43,7 +43,7 @@ RUN set -e && dnf clean all && rm -rf /var/cache/dnf/* \
4343
&& dnf clean all \
4444
&& rm -rf /var/cache/dnf
4545

46-
FROM registry.access.redhat.com/ubi9/ubi:9.4-1214.1726694543 AS base
46+
FROM registry.access.redhat.com/ubi9/ubi:9.5 AS base
4747
ARG TARGETARCH
4848

4949
# Label this image with the repo and commit that built it, for freshmaking purposes.

images/ansible-operator/pipfile.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi9/ubi:9.4-1214.1726694543 AS basebuilder
1+
FROM registry.access.redhat.com/ubi9/ubi:9.5 AS basebuilder
22

33
# Install Rust so that we can ensure backwards compatibility with installing/building the cryptography wheel across all platforms
44
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y

0 commit comments

Comments
 (0)