From b07426782af68d81e745e65bcb8f7256bd978adf Mon Sep 17 00:00:00 2001 From: app-autoscaler-ci-bot Date: Fri, 5 Jul 2024 10:20:43 +0100 Subject: [PATCH 1/2] Update golang version to 1.22.1 --- .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 81ad0e12c2..d3f26bef8f 100644 --- a/.final_builds/packages/golang-1-linux/index.yml +++ b/.final_builds/packages/golang-1-linux/index.yml @@ -43,6 +43,10 @@ builds: version: 5e5e7040d67e2b9a4696bbce1b6b37a16b8bb7d0a220ddda8f3918ecce4b9a2c blobstore_id: 55ae0bcb-1d1a-47e5-650e-72f113b34923 sha1: sha256:b129155ee29328ba69d2447dd8bba56fb002e93caf3c7062fae3374190f8b5ca + 6aad26c0e11f1c08fe8408af93d386eed66fd4c29170b8d9a034677eaa4f61d9: + version: 6aad26c0e11f1c08fe8408af93d386eed66fd4c29170b8d9a034677eaa4f61d9 + blobstore_id: 27de8b5a-9392-418d-4e45-b2babc886d64 + sha1: sha256:6742860369e7ce134e8ca4a037917d386ef6b0b92338a5b46114baee4d3cea19 6f86822e163425375f3a1b9d781b678f30fd4b6ee619b033fcf5e7e18563e74e: version: 6f86822e163425375f3a1b9d781b678f30fd4b6ee619b033fcf5e7e18563e74e blobstore_id: 0a69914c-05f2-4397-4cc1-390d8b2b6640 diff --git a/.tool-versions b/.tool-versions index 9ed0a6d971..bdb6de29e5 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.22.0 +golang 1.22.1 golangci-lint 1.59.1 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 10893da0fb..5dcb602d4a 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.0 +go 1.22.1 diff --git a/go.work b/go.work index 0d0ca8dc94..5c0460b022 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.22.0 +go 1.22.1 use ( ./src/acceptance diff --git a/packages/golang-1-linux/spec.lock b/packages/golang-1-linux/spec.lock index 2af65539d7..b4a0abaed8 100644 --- a/packages/golang-1-linux/spec.lock +++ b/packages/golang-1-linux/spec.lock @@ -1,2 +1,2 @@ name: golang-1-linux -fingerprint: c99f41ac9ed5cc73cf3cd00e320e119572c01a4a2a9857ceac7895ea27ef4965 +fingerprint: 6aad26c0e11f1c08fe8408af93d386eed66fd4c29170b8d9a034677eaa4f61d9 diff --git a/packages/golang-1-linux/vendored-commit b/packages/golang-1-linux/vendored-commit index 794523670d..4a12bf3e90 100644 --- a/packages/golang-1-linux/vendored-commit +++ b/packages/golang-1-linux/vendored-commit @@ -1 +1 @@ -1f5276cbe89af7984ad56d8e0156983cbb97414a +d0adbfe5d5151bc1213172303627039d67e15635 diff --git a/packages/golang-1-linux/version b/packages/golang-1-linux/version index 80a81c0e7f..24b38a9596 100644 --- a/packages/golang-1-linux/version +++ b/packages/golang-1-linux/version @@ -1 +1 @@ -1.22.0 \ No newline at end of file +1.22.1 \ 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 6ffcca9a07..52fa49a533 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.0 +go 1.22.1 require ( github.com/cloudfoundry-community/go-cfenv v1.18.0 diff --git a/src/acceptance/go.mod b/src/acceptance/go.mod index 88bbe8b04e..3bfb258cd7 100644 --- a/src/acceptance/go.mod +++ b/src/acceptance/go.mod @@ -1,6 +1,6 @@ module acceptance -go 1.22.0 +go 1.22.1 require ( github.com/cloudfoundry/cf-test-helpers/v2 v2.9.0 diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index 216dca1220..0fcaf419e6 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.0 +go 1.22.1 require ( code.cloudfoundry.org/cfhttp/v2 v2.1.0 diff --git a/src/changelog/go.mod b/src/changelog/go.mod index b71bb5f81c..8483c2badb 100644 --- a/src/changelog/go.mod +++ b/src/changelog/go.mod @@ -1,6 +1,6 @@ module changelog -go 1.22.0 +go 1.22.1 require ( github.com/Masterminds/semver/v3 v3.2.1 diff --git a/src/changeloglockcleaner/go.mod b/src/changeloglockcleaner/go.mod index 813ad3bcb1..574d53b118 100644 --- a/src/changeloglockcleaner/go.mod +++ b/src/changeloglockcleaner/go.mod @@ -1,6 +1,6 @@ module changeloglockcleaner -go 1.22.0 +go 1.22.1 require ( github.com/go-sql-driver/mysql v1.8.1 From 194ba60fd6d04d25201c041c5442af71abd39d0f Mon Sep 17 00:00:00 2001 From: app-autoscaler-ci-bot Date: Fri, 5 Jul 2024 09:28:57 +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 | 8 ++++---- devbox.lock | 49 ++++++++++++++++++++++++------------------------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/devbox.json b/devbox.json index 4171860ed8..5e58a49aa1 100644 --- a/devbox.json +++ b/devbox.json @@ -33,13 +33,13 @@ "actionlint": "1.7.1", "uutils-coreutils-noprefix": "latest", "gnutar": "latest", - "go": "1.22.0", "golangci-lint": "1.59.1", - "act": "latest", + "yq-go": "4.44.2", + "act": "0.2.64", "google-cloud-sdk": "latest", + "go": "1.22.1", "temurin-bin-17": "latest", - "ruby": "latest", - "yq-go": "4.44.2" + "ruby": "latest" }, "shell": { "init_hook": [ diff --git a/devbox.lock b/devbox.lock index dc34e0e13a..7d39bcf881 100644 --- a/devbox.lock +++ b/devbox.lock @@ -1,51 +1,51 @@ { "lockfile_version": "1", "packages": { - "act@latest": { - "last_modified": "2024-06-12T20:55:33Z", - "resolved": "github:NixOS/nixpkgs/a9858885e197f984d92d7fe64e9fff6b2e488d40#act", + "act@0.2.64": { + "last_modified": "2024-07-02T06:03:53Z", + "resolved": "github:NixOS/nixpkgs/0f56e3221392452f2c38e3ddf2eba03abda6bf47#act", "source": "devbox-search", - "version": "0.2.63", + "version": "0.2.64", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/98mhl0n5ki8xmd5fc3hnwmd7cxz51vcb-act-0.2.63", + "path": "/nix/store/nxdixzwg1nsa6dlm57x41cpj5adm61a1-act-0.2.64", "default": true } ], - "store_path": "/nix/store/98mhl0n5ki8xmd5fc3hnwmd7cxz51vcb-act-0.2.63" + "store_path": "/nix/store/nxdixzwg1nsa6dlm57x41cpj5adm61a1-act-0.2.64" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/9lgr8kbjd2hvaxslr51qp1n5qnxp27wl-act-0.2.63", + "path": "/nix/store/x8h8ls369k6fbfcz675c2vcfz3msi88r-act-0.2.64", "default": true } ], - "store_path": "/nix/store/9lgr8kbjd2hvaxslr51qp1n5qnxp27wl-act-0.2.63" + "store_path": "/nix/store/x8h8ls369k6fbfcz675c2vcfz3msi88r-act-0.2.64" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/86rnzcmj40xfd9akmfgv3421zpsxfvi6-act-0.2.63", + "path": "/nix/store/2jqs9v6ff3p8zjrnhqdwyixviww3nwzf-act-0.2.64", "default": true } ], - "store_path": "/nix/store/86rnzcmj40xfd9akmfgv3421zpsxfvi6-act-0.2.63" + "store_path": "/nix/store/2jqs9v6ff3p8zjrnhqdwyixviww3nwzf-act-0.2.64" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/qjy3wsbk0jwrn6ghmyz2cwk5nf9kaxw5-act-0.2.63", + "path": "/nix/store/pib16kj1s6gmrxzg5l8l2vzmm09ldxyg-act-0.2.64", "default": true } ], - "store_path": "/nix/store/qjy3wsbk0jwrn6ghmyz2cwk5nf9kaxw5-act-0.2.63" + "store_path": "/nix/store/pib16kj1s6gmrxzg5l8l2vzmm09ldxyg-act-0.2.64" } } }, @@ -549,51 +549,51 @@ } } }, - "go@1.22.0": { - "last_modified": "2024-02-24T23:06:34Z", - "resolved": "github:NixOS/nixpkgs/9a9dae8f6319600fa9aebde37f340975cab4b8c0#go_1_22", + "go@1.22.1": { + "last_modified": "2024-04-02T02:53:36Z", + "resolved": "github:NixOS/nixpkgs/080a4a27f206d07724b88da096e27ef63401a504#go", "source": "devbox-search", - "version": "1.22.0", + "version": "1.22.1", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/sbg2nmns0b8invf6ws8yid0gdak18w4d-go-1.22.0", + "path": "/nix/store/pi4myqk3ssdk2lp6z05h3yywknlr07i5-go-1.22.1", "default": true } ], - "store_path": "/nix/store/sbg2nmns0b8invf6ws8yid0gdak18w4d-go-1.22.0" + "store_path": "/nix/store/pi4myqk3ssdk2lp6z05h3yywknlr07i5-go-1.22.1" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/48bhxp3lncnmss2i3f44k3r7wgcm0ijk-go-1.22.0", + "path": "/nix/store/f6wjnm79kazrf8qrg7wjx1va9h874j5a-go-1.22.1", "default": true } ], - "store_path": "/nix/store/48bhxp3lncnmss2i3f44k3r7wgcm0ijk-go-1.22.0" + "store_path": "/nix/store/f6wjnm79kazrf8qrg7wjx1va9h874j5a-go-1.22.1" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/3xay4cky9vhc2ir4prv53n5gbgal0nlj-go-1.22.0", + "path": "/nix/store/lpn4pj00xpvjnr1zlz9xq76r686n16jy-go-1.22.1", "default": true } ], - "store_path": "/nix/store/3xay4cky9vhc2ir4prv53n5gbgal0nlj-go-1.22.0" + "store_path": "/nix/store/lpn4pj00xpvjnr1zlz9xq76r686n16jy-go-1.22.1" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/8yw3g52r95h7cv09lcrran92n212997b-go-1.22.0", + "path": "/nix/store/mzg3cka0bbr5jq96ysymwziw74fnk22m-go-1.22.1", "default": true } ], - "store_path": "/nix/store/8yw3g52r95h7cv09lcrran92n212997b-go-1.22.0" + "store_path": "/nix/store/mzg3cka0bbr5jq96ysymwziw74fnk22m-go-1.22.1" } } }, @@ -1101,7 +1101,6 @@ }, "ruby@latest": { "last_modified": "2024-06-12T20:55:33Z", - "plugin_version": "0.0.2", "resolved": "github:NixOS/nixpkgs/a9858885e197f984d92d7fe64e9fff6b2e488d40#ruby_3_3", "source": "devbox-search", "version": "3.3.2",