From af28435b751631d38b00cf0b9dffac1d666b9162 Mon Sep 17 00:00:00 2001 From: app-autoscaler-ci-bot Date: Thu, 6 Jun 2024 10:27:18 +0100 Subject: [PATCH 1/2] Update golang version to 1.21.6 --- .final_builds/packages/golang-1-linux/index.yml | 4 ++++ .tool-versions | 2 +- .../app-autoscaler/concourse/pipelines/api-tester/src/go.mod | 2 +- go.work | 2 +- packages/golang-1-linux/spec.lock | 2 +- packages/golang-1-linux/vendored-commit | 2 +- packages/golang-1-linux/version | 2 +- src/acceptance/assets/app/go_app/go.mod | 2 +- src/acceptance/go.mod | 2 +- src/autoscaler/go.mod | 2 +- src/changelog/go.mod | 2 +- src/changeloglockcleaner/go.mod | 2 +- 12 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.final_builds/packages/golang-1-linux/index.yml b/.final_builds/packages/golang-1-linux/index.yml index 36e31e3962..595621a462 100644 --- a/.final_builds/packages/golang-1-linux/index.yml +++ b/.final_builds/packages/golang-1-linux/index.yml @@ -71,6 +71,10 @@ builds: version: b8021c5bdc377a4807fb1caad8416215032698ae356825afb427c7efc5ef76c1 blobstore_id: 1085db26-f5ec-42d3-7389-5750b941602a sha1: sha256:2a2785460af04aee276c3c2b38dd914c8e1cbefbf52cb14da130207e82e86289 + c2342901fca75f4c7ec3f32e6a757e923089c6c50d8eb3effd2c25eac1009e31: + version: c2342901fca75f4c7ec3f32e6a757e923089c6c50d8eb3effd2c25eac1009e31 + blobstore_id: b6da37e4-e3d9-451f-639a-17fd1690c6df + sha1: sha256:d354b084ed879adc3218f89b9109b474a68c3eafb5c0ea204c4b77963e4736b0 da6d4c66ebbf23ea0f9bf496e44b9f1f21cae9afa18842617d5b4b257cdfcfbb: version: da6d4c66ebbf23ea0f9bf496e44b9f1f21cae9afa18842617d5b4b257cdfcfbb blobstore_id: 8608be79-d102-4dd7-65f6-279f7bec2063 diff --git a/.tool-versions b/.tool-versions index d20c5c43e9..00e3964005 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.19.0 -golang 1.21.5 +golang 1.21.6 golangci-lint 1.57.2 java temurin-21.0.3+9.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 697d476ebc..6e984b878e 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.21.5 +go 1.21.6 diff --git a/go.work b/go.work index 6dd2e0c8ba..373b4f353f 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.21.5 +go 1.21.6 use ( ./src/acceptance diff --git a/packages/golang-1-linux/spec.lock b/packages/golang-1-linux/spec.lock index 6a23a78647..c93c2bab17 100644 --- a/packages/golang-1-linux/spec.lock +++ b/packages/golang-1-linux/spec.lock @@ -1,2 +1,2 @@ name: golang-1-linux -fingerprint: a53d60ed79d278964faa9bc17836ed3bc5f084c0f3d41110c8a6e0b2de5f2dc0 +fingerprint: c2342901fca75f4c7ec3f32e6a757e923089c6c50d8eb3effd2c25eac1009e31 diff --git a/packages/golang-1-linux/vendored-commit b/packages/golang-1-linux/vendored-commit index 71e8079258..659d8e61fd 100644 --- a/packages/golang-1-linux/vendored-commit +++ b/packages/golang-1-linux/vendored-commit @@ -1 +1 @@ -5dcfbfc3789c847c524993c9c4fbeb085c0f87ec +257d975e17337d944396b59285fea374706c682a diff --git a/packages/golang-1-linux/version b/packages/golang-1-linux/version index d6a49eb373..6e83421e4f 100644 --- a/packages/golang-1-linux/version +++ b/packages/golang-1-linux/version @@ -1 +1 @@ -1.21.5 \ No newline at end of file +1.21.6 \ No newline at end of file diff --git a/src/acceptance/assets/app/go_app/go.mod b/src/acceptance/assets/app/go_app/go.mod index 5b5f8069a7..f2505fa1ee 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.21.5 +go 1.21.6 require ( github.com/cloudfoundry-community/go-cfenv v1.18.0 diff --git a/src/acceptance/go.mod b/src/acceptance/go.mod index f9c379d755..78151acf88 100644 --- a/src/acceptance/go.mod +++ b/src/acceptance/go.mod @@ -1,6 +1,6 @@ module acceptance -go 1.21.5 +go 1.21.6 require ( github.com/cloudfoundry/cf-test-helpers/v2 v2.9.0 diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index 56f13c5f21..ef00c1c62c 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.21.5 +go 1.21.6 require ( code.cloudfoundry.org/cfhttp/v2 v2.1.0 diff --git a/src/changelog/go.mod b/src/changelog/go.mod index 7978d175bb..cbfddc60be 100644 --- a/src/changelog/go.mod +++ b/src/changelog/go.mod @@ -1,6 +1,6 @@ module changelog -go 1.21.5 +go 1.21.6 require ( github.com/Masterminds/semver/v3 v3.2.1 diff --git a/src/changeloglockcleaner/go.mod b/src/changeloglockcleaner/go.mod index 1a4b72cc30..ea0eca4c92 100644 --- a/src/changeloglockcleaner/go.mod +++ b/src/changeloglockcleaner/go.mod @@ -1,6 +1,6 @@ module changeloglockcleaner -go 1.21.5 +go 1.21.6 require ( github.com/go-sql-driver/mysql v1.8.1 From 530c98dd55d1af5b111f341a53bc8718a303fbad Mon Sep 17 00:00:00 2001 From: app-autoscaler-ci-bot Date: Thu, 6 Jun 2024 09:33:27 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A4=96=F0=9F=A6=BE=F0=9F=9B=A0?= =?UTF-8?q?=EF=B8=8F=20scripts/asdf2devbox.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- devbox.json | 4 ++-- devbox.lock | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/devbox.json b/devbox.json index 5e0feda74e..1767886ad7 100644 --- a/devbox.json +++ b/devbox.json @@ -29,14 +29,14 @@ "python": "latest", "cloudfoundry-cli": "8.7.10", "shellcheck": "0.10.0", - "go": "1.21.5", "ruby": "3.3.1", "ginkgo": "2.19.0", "bundix": "latest", "oha": "latest", "gum": "0.13.0", - "act": "latest", + "act": "0.2.63", "google-cloud-sdk": "latest", + "go": "1.21.6", "temurin-bin-17": "latest" }, "shell": { diff --git a/devbox.lock b/devbox.lock index 0e9921deb1..490b9eab58 100644 --- a/devbox.lock +++ b/devbox.lock @@ -1,51 +1,51 @@ { "lockfile_version": "1", "packages": { - "act@latest": { - "last_modified": "2024-05-29T10:04:41Z", - "resolved": "github:NixOS/nixpkgs/ac82a513e55582291805d6f09d35b6d8b60637a1#act", + "act@0.2.63": { + "last_modified": "2024-06-03T07:19:07Z", + "resolved": "github:NixOS/nixpkgs/4a4ecb0ab415c9fccfb005567a215e6a9564cdf5#act", "source": "devbox-search", - "version": "0.2.62", + "version": "0.2.63", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/anliky2rlgzcicrhn1yyv9q4nkz7p8wp-act-0.2.62", + "path": "/nix/store/fhn4kf6qa88l2pl0n202b4mplyc5pcyf-act-0.2.63", "default": true } ], - "store_path": "/nix/store/anliky2rlgzcicrhn1yyv9q4nkz7p8wp-act-0.2.62" + "store_path": "/nix/store/fhn4kf6qa88l2pl0n202b4mplyc5pcyf-act-0.2.63" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/jz4lqgv3amm5vg2kd9qxcw43vzrbcnxv-act-0.2.62", + "path": "/nix/store/5pmgbyh36x428ivx8dg2rq3rvaicjb66-act-0.2.63", "default": true } ], - "store_path": "/nix/store/jz4lqgv3amm5vg2kd9qxcw43vzrbcnxv-act-0.2.62" + "store_path": "/nix/store/5pmgbyh36x428ivx8dg2rq3rvaicjb66-act-0.2.63" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/g4zs1xipwgxx1prvi7bpvymibhiq4cm5-act-0.2.62", + "path": "/nix/store/iwjzs1r05xrdk4xsw6a2c33436s08x18-act-0.2.63", "default": true } ], - "store_path": "/nix/store/g4zs1xipwgxx1prvi7bpvymibhiq4cm5-act-0.2.62" + "store_path": "/nix/store/iwjzs1r05xrdk4xsw6a2c33436s08x18-act-0.2.63" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/xl5x5p5axgrqr9h6p2a3idpmcgmj9407-act-0.2.62", + "path": "/nix/store/4d5qhzbrwm9k9yxnwlkwjn8740mh2hlz-act-0.2.63", "default": true } ], - "store_path": "/nix/store/xl5x5p5axgrqr9h6p2a3idpmcgmj9407-act-0.2.62" + "store_path": "/nix/store/4d5qhzbrwm9k9yxnwlkwjn8740mh2hlz-act-0.2.63" } } }, @@ -457,51 +457,51 @@ } } }, - "go@1.21.5": { - "last_modified": "2024-01-14T03:55:27Z", - "resolved": "github:NixOS/nixpkgs/dd5621df6dcb90122b50da5ec31c411a0de3e538#go", + "go@1.21.6": { + "last_modified": "2024-02-10T18:15:24Z", + "resolved": "github:NixOS/nixpkgs/10b813040df67c4039086db0f6eaf65c536886c6#go", "source": "devbox-search", - "version": "1.21.5", + "version": "1.21.6", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/z6p2j8shdwi74kbm86jwdh03vxq91l0q-go-1.21.5", + "path": "/nix/store/44g95npjwgjyrxm1sx54g22w5sfmkz1i-go-1.21.6", "default": true } ], - "store_path": "/nix/store/z6p2j8shdwi74kbm86jwdh03vxq91l0q-go-1.21.5" + "store_path": "/nix/store/44g95npjwgjyrxm1sx54g22w5sfmkz1i-go-1.21.6" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/1p00q366rk2j7w9lnflrl7xaks7wfq5d-go-1.21.5", + "path": "/nix/store/bq5scmlrr463qwx4yfbid9p3w7009r57-go-1.21.6", "default": true } ], - "store_path": "/nix/store/1p00q366rk2j7w9lnflrl7xaks7wfq5d-go-1.21.5" + "store_path": "/nix/store/bq5scmlrr463qwx4yfbid9p3w7009r57-go-1.21.6" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/brv7d6mlrclkzywf1vaf35wqhq4c0c82-go-1.21.5", + "path": "/nix/store/f0mzci3szxjf0cws1a1vlls6d4zbd8s4-go-1.21.6", "default": true } ], - "store_path": "/nix/store/brv7d6mlrclkzywf1vaf35wqhq4c0c82-go-1.21.5" + "store_path": "/nix/store/f0mzci3szxjf0cws1a1vlls6d4zbd8s4-go-1.21.6" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/rccpgf2bnh58hhh4908p78i1rln9gzvp-go-1.21.5", + "path": "/nix/store/zg65r8ys8y5865lcwmmybrq5gn30n1az-go-1.21.6", "default": true } ], - "store_path": "/nix/store/rccpgf2bnh58hhh4908p78i1rln9gzvp-go-1.21.5" + "store_path": "/nix/store/zg65r8ys8y5865lcwmmybrq5gn30n1az-go-1.21.6" } } },