Revendor with golang 1.18 #6077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

openshift-merge-robot merged 2 commits into openshift:master from r4f4:golang-1.18

Aug 13, 2022

docs/dev/dependencies.md

-Original file line number
+Diff line change
@@ Expand Up @@
     Dependencies are managed with [Go Modules](https://github.com/golang/go/wiki/Modules) but committed directly to the repository.
-    We require at least Go 1.17.
+    We require at least Go 1.18.
     - Add or update a dependency with `go get <dependency>@<version>`.
     - If you want to use a fork of a project or ensure that a dependency is not updated even when another dependency requires a newer version of it, manually add a [replace directive in the go.mod file](https://github.com/golang/go/wiki/Modules#when-should-i-use-the-replace-directive).
@@ Expand Down @@

go.mod

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     module github.com/openshift/installer
-    go 1.17
+    go 1.18
     require (
     	cloud.google.com/go v0.81.0
@@ Expand Down @@

go.sum

Large diffs are not rendered by default.

hack/build.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ copy_terraform_to_mirror() { @@
       cp "${PWD}/terraform/bin/${TARGET_OS_ARCH}/terraform" "${PWD}/pkg/terraform/providers/mirror/terraform/"
     }
-    minimum_go_version=1.17
+    minimum_go_version=1.18
     current_go_version=$(go version | cut -d " " -f 3)
     if [ "$(version "${current_go_version#go}")" -lt "$(version "$minimum_go_version")" ]; then
@@ Expand Down @@

hack/go-fmt.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,6 @@ else @@
         --env IS_CONTAINER=TRUE \
         --volume "${PWD}:/go/src/github.com/openshift/installer:z" \
         --workdir /go/src/github.com/openshift/installer \
-        docker.io/golang:1.17 \
+        docker.io/golang:1.18 \
         ./hack/go-fmt.sh "${@}"
     fi

hack/go-genmock.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,6 @@ else @@
         --env IS_CONTAINER=TRUE \
         --volume "${PWD}:/go/src/github.com/openshift/installer:z" \
         --workdir /go/src/github.com/openshift/installer \
-        docker.io/golang:1.17 \
+        docker.io/golang:1.18 \
         ./hack/go-genmock.sh "${@}"
     fi

hack/go-lint.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,6 @@ else @@
         --env IS_CONTAINER=TRUE \
         --volume "${PWD}:/go/src/github.com/openshift/installer:z" \
         --workdir /go/src/github.com/openshift/installer \
-        docker.io/golang:1.17 \
+        docker.io/golang:1.18 \
         ./hack/go-lint.sh "${@}"
     fi

hack/go-sec.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,6 @@ else @@
         --env IS_CONTAINER=TRUE \
         --volume "${PWD}:/go/src/github.com/openshift/installer:z" \
         --workdir /go/src/github.com/openshift/installer \
-        docker.io/golang:1.17 \
+        docker.io/golang:1.18 \
         ./hack/go-sec.sh "${@}"
     fi

hack/go-test.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,6 @@ else @@
         --env IS_CONTAINER=TRUE \
         --volume "${PWD}:/go/src/github.com/openshift/installer:z" \
         --workdir /go/src/github.com/openshift/installer \
-        docker.io/golang:1.17 \
+        docker.io/golang:1.18 \
         ./hack/go-test.sh "${@}"
     fi

hack/go-vet.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,6 @@ else @@
         --env IS_CONTAINER=TRUE \
         --volume "${PWD}:/go/src/github.com/openshift/installer:z" \
         --workdir /go/src/github.com/openshift/installer \
-        docker.io/golang:1.17 \
+        docker.io/golang:1.18 \
         ./hack/go-vet.sh "${@}"
     fi;

hack/verify-codegen.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,6 @@ else @@
         --env IS_CONTAINER=TRUE \
         --volume "${PWD}:/go/src/github.com/openshift/installer:z" \
         --workdir /go/src/github.com/openshift/installer \
-        docker.io/golang:1.17 \
+        docker.io/golang:1.18 \
         ./hack/verify-codegen.sh "${@}"
     fi

hack/verify-vendor.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -20,11 +20,11 @@ if [ "$IS_CONTAINER" != "" ]; then
  
      verify_module "${PWD}"

      # Verify the sub-modules for the terraform providers.

      # The -compat=1.17 is needed for the openstack provider. The provider uses golang.org/x/mod, which go 1.17 selects

      # The -compat=1.18 is needed for the openstack provider. The provider uses golang.org/x/mod, which go 1.18 selects

      # as v0.3.0 but go 1.16 selects as v0.4.2.

      find terraform/providers -maxdepth 1 -mindepth 1 -print0 | while read -r -d '' dir

      do

        verify_module "$dir" "1.17"

        verify_module "$dir" "1.18"

      done

      # Verify the terraform sub-module.

    @@ -36,6 +36,6 @@ else
  
        --env IS_CONTAINER=TRUE \

        --volume "${PWD}:/go/src/github.com/openshift/installer:z" \

        --workdir /go/src/github.com/openshift/installer \

        docker.io/golang:1.17 \

        docker.io/golang:1.18 \

        ./hack/verify-vendor.sh "${@}"

    fi

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Revendor with golang 1.18 #6077

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!