Skip to content

Commit addb38a

Browse files
authored
update go version in ci and dockerfiles (#318)
* update go version in ci and dockerfiles Signed-off-by: Jordan Dubrick <[email protected]> * revert freezes Signed-off-by: Jordan Dubrick <[email protected]> --------- Signed-off-by: Jordan Dubrick <[email protected]>
1 parent 0144f04 commit addb38a

File tree

6 files changed

+10
-17
lines changed

6 files changed

+10
-17
lines changed

.ci/Dockerfile

+3-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
15-
FROM registry.access.redhat.com/ubi8/go-toolset:1.18 AS builder
15+
FROM registry.access.redhat.com/ubi8/go-toolset:1.19 AS builder
1616

1717
# Set user as root
1818
USER root
@@ -23,18 +23,14 @@ RUN curl -sL -O https://github.com/mikefarah/yq/releases/download/v4.9.5/yq_linu
2323
COPY . /registry
2424

2525
# Download the registry build tools
26-
# Freeze index/generator version at v1.1.0 until Go 1.19 is supported,
27-
# see https://github.com/devfile/api/issues/1473
28-
RUN git clone https://github.com/devfile/registry-support.git -b v1.1.0 /registry-support
26+
RUN git clone https://github.com/devfile/registry-support.git /registry-support
2927

3028
# Run the registry build tools
3129
RUN bash /registry-support/build-tools/build.sh /registry /build
3230

3331
# Set user as non-root
3432
USER 1001
3533

36-
# Freeze at devfile/registry-support commit ffc3a09 until Go 1.19 is supported,
37-
# see https://github.com/devfile/api/issues/1473
38-
FROM quay.io/devfile/devfile-index-base:ffc3a09964b840b3d421dcf5d8d2afbf69322f64
34+
FROM quay.io/devfile/devfile-index-base:next
3935

4036
COPY --from=builder /build /registry

.ci/Dockerfile.offline

+3-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
15-
FROM registry.access.redhat.com/ubi8/go-toolset:1.18 AS builder
15+
FROM registry.access.redhat.com/ubi8/go-toolset:1.19 AS builder
1616

1717
# Set user as root
1818
USER root
@@ -23,9 +23,7 @@ RUN curl -sL -O https://github.com/mikefarah/yq/releases/download/v4.9.5/yq_linu
2323
COPY . /registry
2424

2525
# Download the registry build tools
26-
# Freeze index/generator version at v1.1.0 until Go 1.19 is supported,
27-
# see https://github.com/devfile/api/issues/1473
28-
RUN git clone https://github.com/devfile/registry-support.git -b v1.1.0 /registry-support
26+
RUN git clone https://github.com/devfile/registry-support.git /registry-support
2927

3028
# Download all the offline parent devfiles
3129
RUN bash /registry-support/build-tools/dl_parent_devfiles.sh
@@ -42,9 +40,7 @@ RUN bash /registry-support/build-tools/build.sh /registry /build
4240
# Extract archived resources
4341
RUN bash /registry-support/build-tools/extract_resources.sh
4442

45-
# Freeze at devfile/registry-support commit ffc3a09 until Go 1.19 is supported,
46-
# see https://github.com/devfile/api/issues/1473
47-
FROM quay.io/devfile/devfile-index-base:ffc3a09964b840b3d421dcf5d8d2afbf69322f64
43+
FROM quay.io/devfile/devfile-index-base:next
4844

4945
# Set user as non-root
5046
USER 1001

.devfile.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ components:
4343
# Alternatively could be removed once https://github.com/redhat-developer/odo/issues/7162 is resolved
4444
- name: index-generator
4545
container:
46-
image: registry.access.redhat.com/ubi8/go-toolset:1.18
46+
image: registry.access.redhat.com/ubi8/go-toolset:1.19
4747
# Devfile Registry Deployment resource
4848
- name: devfile-registry-deployment
4949
kubernetes:

.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Setup Go environment
3737
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3838
with:
39-
go-version: 1.18
39+
go-version: 1.19
4040

4141
- name: Check if devfile registry build is working
4242
run: bash registry-repo/.ci/build.sh

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ The public registry is updated weekly, by 12pm EST Wednesdays, with any updated
66

77
## Registry Status
88

9+
![Go](https://img.shields.io/badge/Go-1.19-blue)
910
[![Validate Devfile stacks](https://github.com/devfile/registry/actions/workflows/validate-stacks.yaml/badge.svg?event=schedule)](https://github.com/devfile/registry/actions/workflows/validate-stacks.yaml)
1011
[![Renovate][1]][2]
1112

tests/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
- `minikube start --memory 8gb` is a good starting point.
3030
- The `none` driver **cannot** be used. Any other driver (`docker`, `hyperkit`, etc) should suffice.
3131
- odo v3.0.0-rc2 or later.
32-
- Go 1.18 or later installed
32+
- Go 1.19 or later installed
3333
- `$GOPATH/bin` should be in your `$PATH` or you will have to modify `check_with_odov3.sh` to find `ginkgo` binary.
3434
- Ginkgo CLI installed (`go install github.com/onsi/ginkgo/v2/ginkgo@latest`)
3535

0 commit comments

Comments
 (0)