diff --git a/.final_builds/packages/golang-1-linux/index.yml b/.final_builds/packages/golang-1-linux/index.yml index 7bd2fba27e..28ace79739 100644 --- a/.final_builds/packages/golang-1-linux/index.yml +++ b/.final_builds/packages/golang-1-linux/index.yml @@ -63,6 +63,10 @@ builds: version: 8c04109541f4d504f5be559da433998bd459b0f45cd3654557cc3642cc4d2f60 blobstore_id: d2723887-4744-43c2-64e3-289fe6483132 sha1: sha256:efdf65bca81264d9110ec764be7edea1de341781a1ffe59c219db064d71d9fc3 + 9b1c8ec9041b82347748668b3d274d8183fcb3cb25dd99e8a3a367094836d743: + version: 9b1c8ec9041b82347748668b3d274d8183fcb3cb25dd99e8a3a367094836d743 + blobstore_id: 380835de-8cff-4a99-5425-2dc5c7a937fa + sha1: sha256:acf4c2947a5581b8afa925d1bfbbdb35accc46034345576fcbab9ae4c082c44e a53d60ed79d278964faa9bc17836ed3bc5f084c0f3d41110c8a6e0b2de5f2dc0: version: a53d60ed79d278964faa9bc17836ed3bc5f084c0f3d41110c8a6e0b2de5f2dc0 blobstore_id: 39ce080a-6129-4622-6d8a-f07e063992eb diff --git a/.tool-versions b/.tool-versions index 30bba00e96..8904ddffe6 100644 --- a/.tool-versions +++ b/.tool-versions @@ -7,7 +7,7 @@ concourse 7.10.0 direnv 2.34.0 gcloud 473.0.0 ginkgo 2.20.2 -golang 1.22.3 +golang 1.22.4 golangci-lint 1.60.3 java temurin-21.0.4+7.0.LTS make 4.4 diff --git a/ci/terragrunt/app-autoscaler/concourse/pipelines/api-tester/src/go.mod b/ci/terragrunt/app-autoscaler/concourse/pipelines/api-tester/src/go.mod index d7146d419e..d56a3cab73 100644 --- a/ci/terragrunt/app-autoscaler/concourse/pipelines/api-tester/src/go.mod +++ b/ci/terragrunt/app-autoscaler/concourse/pipelines/api-tester/src/go.mod @@ -1,3 +1,3 @@ module apitester -go 1.22.3 +go 1.22.4 diff --git a/devbox.json b/devbox.json index 0e27918e4b..3b84d9b426 100644 --- a/devbox.json +++ b/devbox.json @@ -35,12 +35,12 @@ "golangci-lint": "1.60.3", "yq-go": "4.44.3", "ginkgo": "2.20.2", - "go": "1.22.3", "bundler": "latest", + "cloudfoundry-cli": "8.8.1", "act": "latest", "actionlint": "latest", - "cloudfoundry-cli": "8.8.1", "google-cloud-sdk": "latest", + "go": "1.22.3", "temurin-bin-21": "latest", "ruby": "latest" }, diff --git a/packages/golang-1-linux/spec.lock b/packages/golang-1-linux/spec.lock index 4dc39f56c9..1382a287cf 100644 --- a/packages/golang-1-linux/spec.lock +++ b/packages/golang-1-linux/spec.lock @@ -1,2 +1,2 @@ name: golang-1-linux -fingerprint: 15120b8865dac54af5d5a7d1d1bc4d35acd37c114c2398f9edb16323184de634 +fingerprint: 9b1c8ec9041b82347748668b3d274d8183fcb3cb25dd99e8a3a367094836d743 diff --git a/packages/golang-1-linux/vendored-commit b/packages/golang-1-linux/vendored-commit index 2ef63f4d2d..0471dd4cf4 100644 --- a/packages/golang-1-linux/vendored-commit +++ b/packages/golang-1-linux/vendored-commit @@ -1 +1 @@ -c35d64e785152d04e7aea49b2ee4b4988c33958d +d1cc520a6cbc298468d1e5055d71a0aea670cf10 diff --git a/packages/golang-1-linux/version b/packages/golang-1-linux/version index 98f7da137c..be02b337a7 100644 --- a/packages/golang-1-linux/version +++ b/packages/golang-1-linux/version @@ -1 +1 @@ -1.22.3 \ No newline at end of file +1.22.4 \ No newline at end of file diff --git a/scripts/asdf2devbox.py b/scripts/asdf2devbox.py index 34712f9d95..f11ee30e66 100755 --- a/scripts/asdf2devbox.py +++ b/scripts/asdf2devbox.py @@ -43,9 +43,15 @@ def get_installed_version(package): try: subprocess.run(['devbox', 'add', f"{program}@{version}"], check=True) except subprocess.CalledProcessError: - # Fallback to latest in case the exact version is not available - subprocess.run(['devbox', 'add', f"{program}@latest"], check=True) - print(f"Could not find {program}@{version}, using latest instead:") + # Fallback to latest in case the exact version is not available and there's no previous version installed + if installed_version is None: + print(f"Could not find {program}@{version}, using latest instead") + subprocess.run(['devbox', 'add', f"{program}@latest"], check=True) + else: + # Readd the previously installed version + print(f"Could not find {program}@{version}, readding {program}@{installed_version}") + subprocess.run(['devbox', 'add', f"{program}@{installed_version}"], check=True) + subprocess.run(['devbox', 'info', program], check=True) else: print(f"{program}@{version} is already installed") diff --git a/src/acceptance/assets/app/go_app/go.mod b/src/acceptance/assets/app/go_app/go.mod index f2ccb6332d..93577d54c0 100644 --- a/src/acceptance/assets/app/go_app/go.mod +++ b/src/acceptance/assets/app/go_app/go.mod @@ -1,6 +1,6 @@ module code.cloudfoundry.org/app-autoscaler-release/src/acceptance/assets/app/go_app -go 1.22.3 +go 1.22.4 require ( github.com/cloudfoundry-community/go-cfenv v1.18.0 diff --git a/src/acceptance/go.mod b/src/acceptance/go.mod index c8ea24039b..8f8a49ddce 100644 --- a/src/acceptance/go.mod +++ b/src/acceptance/go.mod @@ -1,6 +1,6 @@ module acceptance -go 1.22.3 +go 1.22.4 require ( github.com/cloudfoundry/cf-test-helpers/v2 v2.9.0 diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index 143e6dcfc4..0a176a3d38 100644 --- a/src/autoscaler/go.mod +++ b/src/autoscaler/go.mod @@ -1,6 +1,6 @@ module code.cloudfoundry.org/app-autoscaler/src/autoscaler -go 1.22.3 +go 1.22.4 require ( code.cloudfoundry.org/cfhttp/v2 v2.12.0 diff --git a/src/changelog/go.mod b/src/changelog/go.mod index 2235639459..409205914a 100644 --- a/src/changelog/go.mod +++ b/src/changelog/go.mod @@ -1,6 +1,6 @@ module changelog -go 1.22.3 +go 1.22.4 require ( github.com/Masterminds/semver/v3 v3.3.0 diff --git a/src/changeloglockcleaner/go.mod b/src/changeloglockcleaner/go.mod index d30f1189dd..751049d9e2 100644 --- a/src/changeloglockcleaner/go.mod +++ b/src/changeloglockcleaner/go.mod @@ -1,6 +1,6 @@ module changeloglockcleaner -go 1.22.3 +go 1.22.4 require ( github.com/go-sql-driver/mysql v1.8.1