Skip to content

Commit

Permalink
Merge branch 'main' into release-mtar
Browse files Browse the repository at this point in the history
  • Loading branch information
@bonzofenix
bonzofenix authored Oct 1, 2024
2 parents bc83916 + 3b1fc9f commit 202fbdd
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 74 deletions.
2 changes: 1 addition & 1 deletion .tool-versions
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
act 0.2.67
actionlint 1.7.2
actionlint 1.7.3
bosh 7.3.1
credhub 2.9.29
cf 8.8.2
Expand Down
2 changes: 1 addition & 1 deletion ci/terragrunt/.tool-versions
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
gcloud 473.0.0
helm 3.16.1
python 3.12.6
terraform 1.8.5
terraform 1.9.6
terraform-lsp
terragrunt 0.67.14
4 changes: 2 additions & 2 deletions devbox.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
"yq-go": "4.44.3",
"ginkgo": "2.20.2",
"bundler": "latest",
"act": "latest",
"golangci-lint": "1.61.0",
"act": "0.2.67",
"actionlint": "latest",
"cloudfoundry-cli": "8.8.1",
"google-cloud-sdk": "latest",
"go": "1.22.3",
"golangci-lint": "1.61.0",
"temurin-bin-21": "latest",
"ruby": "latest"
},
Expand Down
46 changes: 23 additions & 23 deletions devbox.lock
View file
Original file line number Diff line number Diff line change
@@ -1,99 +1,99 @@
{
"lockfile_version": "1",
"packages": {
"act@latest": {
"last_modified": "2024-09-10T15:01:03Z",
"resolved": "github:NixOS/nixpkgs/5ed627539ac84809c78b2dd6d26a5cebeb5ae269#act",
"act@0.2.67": {
"last_modified": "2024-09-29T05:15:19Z",
"resolved": "github:NixOS/nixpkgs/2dcd9c55e8914017226f5948ac22c53872a13ee2#act",
"source": "devbox-search",
"version": "0.2.66",
"version": "0.2.67",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/wpbqsvhz0p0fxzybqqmhv3j92fyds1xk-act-0.2.66",
"path": "/nix/store/95ng1vsmq36600yl5jnhydwwp7qlw4qs-act-0.2.67",
"default": true
}
],
"store_path": "/nix/store/wpbqsvhz0p0fxzybqqmhv3j92fyds1xk-act-0.2.66"
"store_path": "/nix/store/95ng1vsmq36600yl5jnhydwwp7qlw4qs-act-0.2.67"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/5bv5239h13a2bff3kbq8qd8nyxlnlxsh-act-0.2.66",
"path": "/nix/store/han8drmgpwc6pdz0jyaxf4zs18fsvp40-act-0.2.67",
"default": true
}
],
"store_path": "/nix/store/5bv5239h13a2bff3kbq8qd8nyxlnlxsh-act-0.2.66"
"store_path": "/nix/store/han8drmgpwc6pdz0jyaxf4zs18fsvp40-act-0.2.67"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/hx3976ks2y5v5p6c5853bg8scy2s9xv0-act-0.2.66",
"path": "/nix/store/daqqazwkrf3b4rivcg4wahpij1k0359h-act-0.2.67",
"default": true
}
],
"store_path": "/nix/store/hx3976ks2y5v5p6c5853bg8scy2s9xv0-act-0.2.66"
"store_path": "/nix/store/daqqazwkrf3b4rivcg4wahpij1k0359h-act-0.2.67"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/6sis0w1w41mic6lgpalb08pn6hgkr67j-act-0.2.66",
"path": "/nix/store/8kh39sl27yzgd7pd8smfw5vjkshpxml7-act-0.2.67",
"default": true
}
],
"store_path": "/nix/store/6sis0w1w41mic6lgpalb08pn6hgkr67j-act-0.2.66"
"store_path": "/nix/store/8kh39sl27yzgd7pd8smfw5vjkshpxml7-act-0.2.67"
}
}
},
"actionlint@latest": {
"last_modified": "2024-09-10T15:01:03Z",
"resolved": "github:NixOS/nixpkgs/5ed627539ac84809c78b2dd6d26a5cebeb5ae269#actionlint",
"last_modified": "2024-09-24T10:20:15Z",
"resolved": "github:NixOS/nixpkgs/965289e5e07243f1cde3212d8bcaf726d36c5c46#actionlint",
"source": "devbox-search",
"version": "1.7.1",
"version": "1.7.2",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/lhv2a93jjckg1h3ix8x7vryvhvw878v6-actionlint-1.7.1",
"path": "/nix/store/qv1fnp2ifk37jlr1lbzf5r63vr3q6k41-actionlint-1.7.2",
"default": true
}
],
"store_path": "/nix/store/lhv2a93jjckg1h3ix8x7vryvhvw878v6-actionlint-1.7.1"
"store_path": "/nix/store/qv1fnp2ifk37jlr1lbzf5r63vr3q6k41-actionlint-1.7.2"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/4w9w3lb0q5k8az0l2z3897imiflmbdmg-actionlint-1.7.1",
"path": "/nix/store/nw0xpacz21b9rszn4k6ay452pf8amf1p-actionlint-1.7.2",
"default": true
}
],
"store_path": "/nix/store/4w9w3lb0q5k8az0l2z3897imiflmbdmg-actionlint-1.7.1"
"store_path": "/nix/store/nw0xpacz21b9rszn4k6ay452pf8amf1p-actionlint-1.7.2"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/pn5lm8v33as5nz64c5ywiapj7a23058r-actionlint-1.7.1",
"path": "/nix/store/rh6f40c82jp5z3irxsq6lfapg6ckc9br-actionlint-1.7.2",
"default": true
}
],
"store_path": "/nix/store/pn5lm8v33as5nz64c5ywiapj7a23058r-actionlint-1.7.1"
"store_path": "/nix/store/rh6f40c82jp5z3irxsq6lfapg6ckc9br-actionlint-1.7.2"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/syvxybli9kzpbsg6i7ak86hq7klg1ak5-actionlint-1.7.1",
"path": "/nix/store/ggpghzgdd1cv04hh93cmqjb7mm3zqc7m-actionlint-1.7.2",
"default": true
}
],
"store_path": "/nix/store/syvxybli9kzpbsg6i7ak86hq7klg1ak5-actionlint-1.7.1"
"store_path": "/nix/store/ggpghzgdd1cv04hh93cmqjb7mm3zqc7m-actionlint-1.7.2"
}
}
},
Expand Down
34 changes: 17 additions & 17 deletions jobs/Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ GEM
json (2.7.2)
language_server-protocol (3.17.0.3)
lint_roller (1.1.0)
parallel (1.24.0)
parser (3.3.0.5)
parallel (1.26.3)
parser (3.3.5.0)
ast (~> 2.4.1)
racc
racc (1.7.3)
racc (1.8.1)
rainbow (3.1.1)
regexp_parser (2.9.0)
rexml (3.2.6)
regexp_parser (2.9.2)
rexml (3.3.8)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
Expand All @@ -34,37 +34,37 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)
rubocop (1.62.1)
rubocop (1.65.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
regexp_parser (>= 2.4, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.2)
parser (>= 3.3.0.4)
rubocop-performance (1.20.2)
rubocop-ast (1.32.3)
parser (>= 3.3.1.0)
rubocop-performance (1.21.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (1.13.0)
semi_semantic (1.2.0)
standard (1.35.1)
standard (1.40.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.62.0)
rubocop (~> 1.65.0)
standard-custom (~> 1.0.0)
standard-performance (~> 1.3)
standard-performance (~> 1.4)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
standard-performance (1.3.1)
standard-performance (1.4.0)
lint_roller (~> 1.1)
rubocop-performance (~> 1.20.2)
unicode-display_width (2.5.0)
rubocop-performance (~> 1.21.0)
unicode-display_width (2.6.0)

PLATFORMS
ruby
Expand Down
34 changes: 17 additions & 17 deletions spec/Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ GEM
json (2.7.2)
language_server-protocol (3.17.0.3)
lint_roller (1.1.0)
parallel (1.24.0)
parser (3.3.0.5)
parallel (1.26.3)
parser (3.3.5.0)
ast (~> 2.4.1)
racc
racc (1.7.3)
racc (1.8.1)
rainbow (3.1.1)
regexp_parser (2.9.0)
rexml (3.2.6)
regexp_parser (2.9.2)
rexml (3.3.8)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
Expand All @@ -34,37 +34,37 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)
rubocop (1.62.1)
rubocop (1.65.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
regexp_parser (>= 2.4, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.2)
parser (>= 3.3.0.4)
rubocop-performance (1.20.2)
rubocop-ast (1.32.3)
parser (>= 3.3.1.0)
rubocop-performance (1.21.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (1.13.0)
semi_semantic (1.2.0)
standard (1.35.1)
standard (1.40.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.62.0)
rubocop (~> 1.65.0)
standard-custom (~> 1.0.0)
standard-performance (~> 1.3)
standard-performance (~> 1.4)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
standard-performance (1.3.1)
standard-performance (1.4.0)
lint_roller (~> 1.1)
rubocop-performance (~> 1.20.2)
unicode-display_width (2.5.0)
rubocop-performance (~> 1.21.0)
unicode-display_width (2.6.0)

PLATFORMS
x86_64-darwin-21
Expand Down
4 changes: 2 additions & 2 deletions src/autoscaler/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
code.cloudfoundry.org/go-log-cache/v3 v3.0.3
code.cloudfoundry.org/go-loggregator/v10 v10.0.1
code.cloudfoundry.org/lager/v3 v3.6.0
code.cloudfoundry.org/loggregator-agent-release/src v0.0.0-20240923083236-43d741a3be1f
code.cloudfoundry.org/loggregator-agent-release/src v0.0.0-20240930083239-4de1c6aa0f7c
code.cloudfoundry.org/tlsconfig v0.5.0
github.com/cenkalti/backoff/v4 v4.3.0
github.com/cloud-gov/go-cfenv v1.19.1
Expand Down Expand Up @@ -49,7 +49,7 @@ require (
gopkg.in/yaml.v3 v3.0.1
)

replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20240924160255-9d4c2d233b61
replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20240930140551-af27646dc61f

require (
code.cloudfoundry.org/go-diodes v0.0.0-20240911205836-e7f77fdf9650 // indirect
Expand Down
Loading

0 comments on commit 202fbdd

Please sign in to comment.