diff --git a/.github/workflows/asdf2devbox.yaml b/.github/workflows/asdf2devbox.yaml index 405a86e316..1ef323643a 100644 --- a/.github/workflows/asdf2devbox.yaml +++ b/.github/workflows/asdf2devbox.yaml @@ -80,6 +80,7 @@ jobs: echo 'Changes to some files were necessary!' git add . git commit --message="${tidy_message}" + git pull --rebase=true git push origin "HEAD:${GITHUB_HEAD_REF}" else echo 'No files changed!' diff --git a/.github/workflows/dependency-updates-post-processing.yaml b/.github/workflows/dependency-updates-post-processing.yaml index e241107183..bf655fb437 100644 --- a/.github/workflows/dependency-updates-post-processing.yaml +++ b/.github/workflows/dependency-updates-post-processing.yaml @@ -92,6 +92,7 @@ jobs: echo 'Changes to some files were necessary!' git add . git commit --message="${tidy_message}" + git pull --rebase=true git push gh pr review --approve else diff --git a/.tool-versions b/.tool-versions index 28c8a95033..5edaf94a5d 100644 --- a/.tool-versions +++ b/.tool-versions @@ -5,7 +5,7 @@ cf 8.7.10 concourse 7.10.0 direnv 2.34.0 gcloud 473.0.0 -ginkgo 2.17.2 +ginkgo 2.17.3 golang 1.21.5 golangci-lint 1.57.2 java temurin-21.0.3+9.0.LTS diff --git a/ci/dockerfiles/autoscaler-tools/Dockerfile b/ci/dockerfiles/autoscaler-tools/Dockerfile index 115f0e0103..589caedb6d 100644 --- a/ci/dockerfiles/autoscaler-tools/Dockerfile +++ b/ci/dockerfiles/autoscaler-tools/Dockerfile @@ -130,7 +130,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages. gcloud version # renovate: datasource=github-releases depName=ginkgo lookupName=onsi/ginkgo -ARG GINKGO_VERSION=v2.17.2 +ARG GINKGO_VERSION=v2.17.3 RUN go install github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VERSION} && \ ginkgo version diff --git a/src/acceptance/assets/app/go_app/go.mod b/src/acceptance/assets/app/go_app/go.mod index bd5296f1e2..50d5e15c29 100644 --- a/src/acceptance/assets/app/go_app/go.mod +++ b/src/acceptance/assets/app/go_app/go.mod @@ -15,7 +15,7 @@ require ( github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1 github.com/mitchellh/mapstructure v1.5.0 github.com/ogen-go/ogen v1.1.0 - github.com/onsi/ginkgo/v2 v2.17.2 + github.com/onsi/ginkgo/v2 v2.17.3 github.com/onsi/gomega v1.33.1 github.com/prometheus/procfs v0.14.0 github.com/steinfletcher/apitest v1.5.15 diff --git a/src/acceptance/go.mod b/src/acceptance/go.mod index 74a970e81e..3271890977 100644 --- a/src/acceptance/go.mod +++ b/src/acceptance/go.mod @@ -4,7 +4,7 @@ go 1.21.5 require ( github.com/cloudfoundry/cf-test-helpers/v2 v2.9.0 - github.com/onsi/ginkgo/v2 v2.17.2 + github.com/onsi/ginkgo/v2 v2.17.3 github.com/onsi/gomega v1.33.1 github.com/stretchr/testify v1.9.0 ) diff --git a/src/acceptance/go.sum b/src/acceptance/go.sum index 6c499d2e35..8d7158f980 100644 --- a/src/acceptance/go.sum +++ b/src/acceptance/go.sum @@ -19,8 +19,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= -github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= +github.com/onsi/ginkgo/v2 v2.17.3 h1:oJcvKpIb7/8uLpDDtnQuf18xVnwKp8DTD7DQ6gTd/MU= +github.com/onsi/ginkgo/v2 v2.17.3/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index 61c89081a8..be98240be5 100644 --- a/src/autoscaler/go.mod +++ b/src/autoscaler/go.mod @@ -25,7 +25,7 @@ require ( github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d github.com/ogen-go/ogen v1.1.0 - github.com/onsi/ginkgo/v2 v2.17.2 + github.com/onsi/ginkgo/v2 v2.17.3 github.com/onsi/gomega v1.33.1 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pivotal-cf/brokerapi/v11 v11.0.0 diff --git a/src/changeloglockcleaner/go.mod b/src/changeloglockcleaner/go.mod index 2981bb933b..93aff1bbf6 100644 --- a/src/changeloglockcleaner/go.mod +++ b/src/changeloglockcleaner/go.mod @@ -6,7 +6,7 @@ require ( github.com/go-sql-driver/mysql v1.8.1 github.com/jackc/pgx/v5 v5.5.5 github.com/jmoiron/sqlx v1.4.0 - github.com/onsi/ginkgo/v2 v2.17.2 + github.com/onsi/ginkgo/v2 v2.17.3 github.com/onsi/gomega v1.33.1 ) diff --git a/src/changeloglockcleaner/go.sum b/src/changeloglockcleaner/go.sum index cb627267e9..11e449e068 100644 --- a/src/changeloglockcleaner/go.sum +++ b/src/changeloglockcleaner/go.sum @@ -32,8 +32,8 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= -github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= -github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= +github.com/onsi/ginkgo/v2 v2.17.3 h1:oJcvKpIb7/8uLpDDtnQuf18xVnwKp8DTD7DQ6gTd/MU= +github.com/onsi/ginkgo/v2 v2.17.3/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=