Skip to content

Commit

Permalink
Update additional files to use go 1.19.13
Browse files Browse the repository at this point in the history
  • Loading branch information
SDawley committed Oct 30, 2023
1 parent df16103 commit 4323201
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .ci/openshift-ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

# Dockerfile to bootstrap build and test in openshift-ci

FROM registry.ci.openshift.org/openshift/release:golang-1.18
FROM registry.ci.openshift.org/openshift/release:golang-1.19

SHELL ["/bin/bash", "-c"]

Expand Down
12 changes: 6 additions & 6 deletions .devfile.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM quay.io/devfile/universal-developer-image:ubi8-latest

#install Go 1.18
RUN cd /tmp && wget https://go.dev/dl/go1.18.6.linux-amd64.tar.gz && \
mkdir $HOME/go1.18 && \
tar -xvzf go1.18.6.linux-amd64.tar.gz -C $HOME/go1.18 --strip-components 1 && \
if ! grep -q "export PATH=\$HOME/go1.18/bin:\$PATH" $HOME/.bashrc; then echo "export PATH=\$HOME/go1.18/bin:\$PATH" >> $HOME/.bashrc; fi
#install Go 1.19
RUN cd /tmp && wget https://go.dev/dl/go1.19.13.linux-amd64.tar.gz && \
mkdir $HOME/go1.19 && \
tar -xvzf go1.19.13.linux-amd64.tar.gz -C $HOME/go1.19 --strip-components 1 && \
if ! grep -q "export PATH=\$HOME/go1.19/bin:\$PATH" $HOME/.bashrc; then echo "export PATH=\$HOME/go1.19/bin:\$PATH" >> $HOME/.bashrc; fi

# install chectl
RUN tag=$(curl https://api.github.com/repos/che-incubator/chectl/tags | jq -r '.[0].name') && \
Expand All @@ -14,4 +14,4 @@ RUN tag=$(curl https://api.github.com/repos/che-incubator/chectl/tags | jq -r '.
if ! grep -q "export PATH=\$HOME/chectl/bin:\$PATH" $HOME/.bashrc; then echo "export PATH=\$HOME/chectl/bin:\$PATH" >> $HOME/.bashrc; fi

# install goimports
RUN $HOME/go1.18/bin/go install golang.org/x/tools/cmd/goimports@latest
RUN $HOME/go1.19/bin/go install golang.org/x/tools/cmd/goimports@latest
4 changes: 2 additions & 2 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up Go 1.18
- name: Set up Go 1.19
uses: actions/setup-go@v3
with:
go-version: 1.18
go-version: 1.19.13
- name: Run unit tests
run: make test
- name: Build Codecov report
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
steps:
- name: Checkout source code
uses: actions/checkout@v3
- name: Set up Go 1.18
- name: Set up Go 1.19
uses: actions/setup-go@v3
with:
go-version: 1.18
go-version: 1.19.13
- name: Run unit tests
run: make test
image-build:
Expand Down Expand Up @@ -51,10 +51,10 @@ jobs:
steps:
- name: Checkout source code
uses: actions/checkout@v3
- name: Set up Go 1.18
- name: Set up Go 1.19
uses: actions/setup-go@v3
with:
go-version: 1.18
go-version: 1.19.13
- name: Cache go modules
id: cache-mod
uses: actions/cache@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ jobs:
sudo chmod +x /usr/local/bin/base32
#remove base32 from current directory to avoid it being commited during release
rm $(pwd)/base32
- name: Set up Go 1.18
- name: Set up Go 1.19
uses: actions/setup-go@v3
with:
go-version: 1.18
go-version: 1.19.13
- name: Release operator
env:
IMAGE_REGISTRY_HOST: quay.io
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/resources-check-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
uses: actions/checkout@v3
- name: Install yq
run: sudo pip install yq
- name: Set up Go 1.18
- name: Set up Go 1.19
uses: actions/setup-go@v3
with:
go-version: 1.18
go-version: 1.19.13
- name: Validate operator resources
run: |
go install golang.org/x/tools/cmd/goimports@latest
Expand All @@ -38,9 +38,9 @@ jobs:
uses: actions/checkout@v3
- name: Install yq
run: sudo pip install yq
- name: Set up Go 1.18
- name: Set up Go 1.19
uses: actions/setup-go@v3
with:
go-version: 1.18
go-version: 1.19.13
- name: Validate OLM bundle version
run: ${GITHUB_WORKSPACE}/build/scripts/check-bundle-version.sh
2 changes: 1 addition & 1 deletion build/scripts/docker-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ init() {
build() {
printf "%bBuilding image %b${IMAGE_NAME}${NC}..." "${BOLD}" "${BLUE}"
if docker build -t ${IMAGE_NAME} > docker-build-log 2>&1 -<<EOF
FROM golang:1.18-bullseye
FROM golang:1.19.13-bullseye
RUN apt update && apt install python3-pip skopeo jq rsync unzip -y && pip install yq && \
curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \
install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl && \
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/eclipse-che/che-operator

go 1.18
go 1.19

require (
github.com/che-incubator/kubernetes-image-puller-operator v0.0.0-20210929175054-0128446f5af7
Expand Down

0 comments on commit 4323201

Please sign in to comment.