Skip to content

Commit

Permalink
go 1.21
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Valdron <[email protected]>
  • Loading branch information
michael-valdron committed Jun 11, 2024
1 parent eaba8b9 commit e889d7b
Show file tree
Hide file tree
Showing 12 changed files with 85 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM registry.access.redhat.com/ubi8/go-toolset:1.19 AS builder
FROM registry.access.redhat.com/ubi8/go-toolset:1.21 AS builder

# Set user as root
USER root
Expand Down
2 changes: 1 addition & 1 deletion .ci/Dockerfile.offline
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM registry.access.redhat.com/ubi8/go-toolset:1.19 AS builder
FROM registry.access.redhat.com/ubi8/go-toolset:1.21 AS builder

# Set user as root
USER root
Expand Down
5 changes: 4 additions & 1 deletion .ci/openshift_integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ set -x
# Disable telemtry for odo
export ODO_DISABLE_TELEMETRY=true

# Set yq version
YQ_VERSION=${YQ_VERSION:-v4.44.1}

# Split the registry image and image tag from the REGISTRY_IMAGE env variable
IMG="$(echo $REGISTRY_IMAGE | cut -d':' -f1)"
TAG="$(echo $REGISTRY_IMAGE | cut -d':' -f2)"
Expand All @@ -35,7 +38,7 @@ TAG="$(echo $REGISTRY_IMAGE | cut -d':' -f2)"
oc new-project devfile-registry-test

# Install yq
curl -sL https://github.com/mikefarah/yq/releases/download/v4.9.5/yq_linux_amd64 -o yq && chmod +x yq
curl -sL https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 -o yq && chmod +x yq
YQ_PATH=$(realpath yq)

# Download odo
Expand Down
2 changes: 1 addition & 1 deletion .devfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ components:
# Alternatively could be removed once https://github.com/redhat-developer/odo/issues/7162 is resolved
- name: index-generator
container:
image: registry.access.redhat.com/ubi8/go-toolset:1.19
image: registry.access.redhat.com/ubi8/go-toolset:1.21
# Devfile Registry Deployment resource
- name: devfile-registry-deployment
kubernetes:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The public registry is updated weekly, by 12pm EST Wednesdays, with any updated

## Registry Status

![Go](https://img.shields.io/badge/Go-1.19-blue)
![Go](https://img.shields.io/badge/Go-1.21-blue)
[![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)
[![Renovate][1]][2]

Expand Down
2 changes: 1 addition & 1 deletion tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ STACKS_DIR=.cache/samples bash tests/validate_devfile_schemas.sh --samples
- `minikube start --memory 8gb` is a good starting point.
- The `none` driver **cannot** be used. Any other driver (`docker`, `hyperkit`, etc) should suffice.
- odo v3.0.0-rc2 or later.
- Go 1.19 or later installed
- Go 1.21 or later installed
- `$GOPATH/bin` should be in your `$PATH` or you will have to modify `check_with_odov3.sh` to find `ginkgo` binary.
- Ginkgo CLI installed (`go install github.com/onsi/ginkgo/v2/ginkgo@latest`)

Expand Down
2 changes: 1 addition & 1 deletion tests/odov3/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/devfile/registry/tests/odov3

go 1.19
go 1.21

require (
github.com/devfile/api/v2 v2.2.2
Expand Down
36 changes: 36 additions & 0 deletions tests/odov3/go.sum

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion tests/odov3/odo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ var stacksPath string
var stackDirs string

func init() {
rand.Seed(time.Now().UnixNano())
flag.StringVar(&stacksPath, "stacksPath", "../../stacks", "The path to the directory containing the stacks")
flag.StringVar(&stackDirs, "stackDirs", "", "The stacks to test as a string separated by spaces")
}
Expand Down
2 changes: 1 addition & 1 deletion tests/validate_devfile_schemas/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/devfile/registry/tests/validate_devfiles

go 1.19
go 1.21

require (
github.com/devfile/library/v2 v2.2.2
Expand Down
38 changes: 38 additions & 0 deletions tests/validate_devfile_schemas/go.sum

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ package main
import (
"flag"
"fmt"
"math/rand"
"path/filepath"
"strings"
"testing"
"time"

"github.com/devfile/library/v2/pkg/devfile"
"github.com/devfile/library/v2/pkg/devfile/parser"
Expand All @@ -19,7 +17,6 @@ var stacksPath string
var stackDirs string

func init() {
rand.Seed(time.Now().UnixNano())
flag.StringVar(&stacksPath, "stacksPath", "../../stacks", "The path to the directory containing the stacks")
flag.StringVar(&stackDirs, "stackDirs", "", "The stacks to test as a string separated by spaces")
}
Expand Down

0 comments on commit e889d7b

Please sign in to comment.