ManageIQ / manageiq-pods

ManageIQ on Kubernetes and OpenShift
Apache License 2.0
51 stars 100 forks source link

Update module github.com/onsi/gomega to v1.34.2 #1160

Closed renovate[bot] closed 2 weeks ago

renovate[bot] commented 2 weeks ago

This PR contains the following updates:

Package Change Age Adoption Passing Confidence
github.com/onsi/gomega v1.34.1 -> v1.34.2 age adoption passing confidence

Release Notes

onsi/gomega (github.com/onsi/gomega) ### [`v1.34.2`](https://togithub.com/onsi/gomega/releases/tag/v1.34.2) [Compare Source](https://togithub.com/onsi/gomega/compare/v1.34.1...v1.34.2) #### 1.34.2 Require Go 1.22+ ##### Maintenance - bump ginkgo as well \[[`c59c6dc`](https://togithub.com/onsi/gomega/commit/c59c6dc)] - bump to go 1.22 - remove x/exp dependency \[[`8158b99`](https://togithub.com/onsi/gomega/commit/8158b99)]

Configuration

πŸ“… Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

β™» Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

πŸ”• Ignore: Close this PR and you won't be reminded about this update again.



This PR was generated by Mend Renovate. View the repository job log.

miq-bot commented 2 weeks ago

Checked commit https://github.com/ManageIQ/manageiq-pods/commit/8b54cfd4835b6627945c99ad7cc39166f8149721 with ruby 3.1.5, rubocop 1.56.3, haml-lint 0.51.0, and yamllint 0 files checked, 0 offenses detected Everything looks fine. :cookie:

Fryguy commented 1 week ago

@renovate[bot] A conflict occurred during the backport of this pull request to radjabov.

If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the radjabov branch in order to resolve this.

Conflict details:

diff --cc manageiq-operator/go.mod
index e80d048,a3a8e54..0000000
--- a/manageiq-operator/go.mod
+++ b/manageiq-operator/go.mod
@@@ -4,8 -4,8 +4,13 @@@ go 1.2

  require (
    github.com/onsi/ginkgo/v2 v2.20.2
++<<<<<<< HEAD
 +  github.com/onsi/gomega v1.34.1
 +  github.com/openshift/api v0.0.0-20240817011637-2c10e5887729
++=======
+   github.com/onsi/gomega v1.34.2
+   github.com/openshift/api v0.0.0-20240823112050-2b42490270d8
++>>>>>>> 37f4da4 (Merge pull request #1160 from ManageIQ/renovate/github.com-onsi-gomega-1.x)
    github.com/operator-framework/api v0.27.0
    k8s.io/api v0.31.0
    k8s.io/apimachinery v0.31.0
diff --cc manageiq-operator/go.sum
index 02bce90,2110bae..0000000
--- a/manageiq-operator/go.sum
+++ b/manageiq-operator/go.sum
@@@ -75,10 -75,10 +75,17 @@@ github.com/munnerz/goautoneg v0.0.0-201
  github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
  github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
  github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
++<<<<<<< HEAD
 +github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
 +github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
 +github.com/openshift/api v0.0.0-20240817011637-2c10e5887729 h1:UDP4jBAV9v5Lb7yEryeOZ8lltwIYedyDPtXnUnEbzOA=
 +github.com/openshift/api v0.0.0-20240817011637-2c10e5887729/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
++=======
+ github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
+ github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc=
+ github.com/openshift/api v0.0.0-20240823112050-2b42490270d8 h1:1Dgn1a5HWbNZK2zYEZXnjM/4KAe3xWekQrl0sYPNWpA=
+ github.com/openshift/api v0.0.0-20240823112050-2b42490270d8/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
++>>>>>>> 37f4da4 (Merge pull request #1160 from ManageIQ/renovate/github.com-onsi-gomega-1.x)
  github.com/operator-framework/api v0.27.0 h1:OrVaGKZJvbZo58HTv2guz7aURkhVKYhFqZ/6VpifiXI=
  github.com/operator-framework/api v0.27.0/go.mod h1:lg2Xx+S8NQWGYlEOvFwQvH46E5EK5IrAIL7HWfAhciM=
  github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
Fryguy commented 1 week ago

Backported to radjabov in commit 0d778ce9083bfedfcf06b690fb2053378df6d60b.

commit 0d778ce9083bfedfcf06b690fb2053378df6d60b
Author: Brandon Dunne <brandondunne@hotmail.com>
Date:   Wed Aug 28 18:38:48 2024 -0400

    Merge pull request #1160 from ManageIQ/renovate/github.com-onsi-gomega-1.x

    Update module github.com/onsi/gomega to v1.34.2

    (cherry picked from commit 37f4da44c9425a1fa370e8e063f24211588a3efc)