Skip to content

Commit cf9ce10

Browse files
committed
Merge remote-tracking branch 'os-origin/main' into pipeline-fixes
2 parents 8587834 + 319d48c commit cf9ce10

File tree

3 files changed

+55
-55
lines changed

3 files changed

+55
-55
lines changed

.github/workflows/image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
6363
- name: Build and push
6464
id: build-and-push
65-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6
65+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6
6666
with:
6767
context: ci/dockerfiles/autoscaler-${{ matrix.image_suffix }}
6868
push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}

devbox.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,27 @@
1313
"cloudfoundry-cli": "8.12.0",
1414
"coreutils": "latest",
1515
"credhub-cli": "2.9.44",
16-
"delve": "1.24.1",
16+
"delve": "1.24.2",
1717
"direnv": "2.36.0",
18-
"fly": "7.12.1",
18+
"fly": "7.13.0",
1919
"gh": "2.69.0",
2020
"ginkgo": "2.23.4",
2121
"gnumake": "4.4",
2222
"gnutar": "latest",
2323
"go": "1.23.1",
2424
"go-tools": "2025.1",
2525
"golangci-lint": "1.64.8",
26-
"google-java-format": "1.25.2",
26+
"google-java-format": "1.26.0",
2727
"gopls": "0.18.1",
2828
"gum": "0.16.0",
2929
"jq": "latest",
3030
"markdownlint-cli2": "0.17.2",
3131
"maven": "3.9.9",
32-
"mysql": "latest",
32+
"mysql": "10.6.12",
3333
"oha": "1.8.0",
3434
"postgresql": "latest",
3535
"python": "3.13.2",
36-
"redocly": "1.29.0",
36+
"redocly": "1.34.0",
3737
"ripgrep": "latest",
3838
"ruby": "3.4.2",
3939
"shellcheck": "0.10.0",

devbox.lock

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -361,51 +361,51 @@
361361
}
362362
}
363363
},
364-
365-
"last_modified": "2025-03-16T16:17:41Z",
366-
"resolved": "github:NixOS/nixpkgs/8f76cf16b17c51ae0cc8e55488069593f6dab645#delve",
364+
365+
"last_modified": "2025-04-12T07:19:22Z",
366+
"resolved": "github:NixOS/nixpkgs/2349f9de17183971db12ae9e0123dab132023bd7#delve",
367367
"source": "devbox-search",
368-
"version": "1.24.1",
368+
"version": "1.24.2",
369369
"systems": {
370370
"aarch64-darwin": {
371371
"outputs": [
372372
{
373373
"name": "out",
374-
"path": "/nix/store/fwkl0xwbplbks24sqyapddjkd5fsznbv-delve-1.24.1",
374+
"path": "/nix/store/g8jvrazh2rp6a79yr9n7i38zgb826g0y-delve-1.24.2",
375375
"default": true
376376
}
377377
],
378-
"store_path": "/nix/store/fwkl0xwbplbks24sqyapddjkd5fsznbv-delve-1.24.1"
378+
"store_path": "/nix/store/g8jvrazh2rp6a79yr9n7i38zgb826g0y-delve-1.24.2"
379379
},
380380
"aarch64-linux": {
381381
"outputs": [
382382
{
383383
"name": "out",
384-
"path": "/nix/store/zyfrxdw63xqfbn06zcfgfip9rpcnvizd-delve-1.24.1",
384+
"path": "/nix/store/6kx7rz2n3p6vlznp3g3j80c4z7kijvdb-delve-1.24.2",
385385
"default": true
386386
}
387387
],
388-
"store_path": "/nix/store/zyfrxdw63xqfbn06zcfgfip9rpcnvizd-delve-1.24.1"
388+
"store_path": "/nix/store/6kx7rz2n3p6vlznp3g3j80c4z7kijvdb-delve-1.24.2"
389389
},
390390
"x86_64-darwin": {
391391
"outputs": [
392392
{
393393
"name": "out",
394-
"path": "/nix/store/5d7h4a0xyw2hbablaiyjr99k8wi9avpg-delve-1.24.1",
394+
"path": "/nix/store/6rl9sxq8vz2m5dl939m4bcawgdm7ppac-delve-1.24.2",
395395
"default": true
396396
}
397397
],
398-
"store_path": "/nix/store/5d7h4a0xyw2hbablaiyjr99k8wi9avpg-delve-1.24.1"
398+
"store_path": "/nix/store/6rl9sxq8vz2m5dl939m4bcawgdm7ppac-delve-1.24.2"
399399
},
400400
"x86_64-linux": {
401401
"outputs": [
402402
{
403403
"name": "out",
404-
"path": "/nix/store/154hrs4h5qgwrv4dhb0zl6w7cxyy6wxp-delve-1.24.1",
404+
"path": "/nix/store/a28mgd5nnfnz9z781cxc0ph6hrn9qrpw-delve-1.24.2",
405405
"default": true
406406
}
407407
],
408-
"store_path": "/nix/store/154hrs4h5qgwrv4dhb0zl6w7cxyy6wxp-delve-1.24.1"
408+
"store_path": "/nix/store/a28mgd5nnfnz9z781cxc0ph6hrn9qrpw-delve-1.24.2"
409409
}
410410
}
411411
},
@@ -457,51 +457,51 @@
457457
}
458458
}
459459
},
460-
"fly@7.12.1": {
461-
"last_modified": "2025-03-11T17:52:14Z",
462-
"resolved": "github:NixOS/nixpkgs/0d534853a55b5d02a4ababa1d71921ce8f0aee4c#fly",
460+
"fly@7.13.0": {
461+
"last_modified": "2025-04-13T09:22:33Z",
462+
"resolved": "github:NixOS/nixpkgs/18dd725c29603f582cf1900e0d25f9f1063dbf11#fly",
463463
"source": "devbox-search",
464-
"version": "7.12.1",
464+
"version": "7.13.0",
465465
"systems": {
466466
"aarch64-darwin": {
467467
"outputs": [
468468
{
469469
"name": "out",
470-
"path": "/nix/store/vjjbrd0qvcy6sf1z8bfy7rsjkbgpmghm-fly-7.12.1",
470+
"path": "/nix/store/xag669v1qd9jsxmplnxwm3zn5hz9kxrn-fly-7.13.0",
471471
"default": true
472472
}
473473
],
474-
"store_path": "/nix/store/vjjbrd0qvcy6sf1z8bfy7rsjkbgpmghm-fly-7.12.1"
474+
"store_path": "/nix/store/xag669v1qd9jsxmplnxwm3zn5hz9kxrn-fly-7.13.0"
475475
},
476476
"aarch64-linux": {
477477
"outputs": [
478478
{
479479
"name": "out",
480-
"path": "/nix/store/cadfvbyvqp05dvw0av5g31vdnjhkirz1-fly-7.12.1",
480+
"path": "/nix/store/z2gc8f7xxp0q55qgj4s8q0c7dbakwggj-fly-7.13.0",
481481
"default": true
482482
}
483483
],
484-
"store_path": "/nix/store/cadfvbyvqp05dvw0av5g31vdnjhkirz1-fly-7.12.1"
484+
"store_path": "/nix/store/z2gc8f7xxp0q55qgj4s8q0c7dbakwggj-fly-7.13.0"
485485
},
486486
"x86_64-darwin": {
487487
"outputs": [
488488
{
489489
"name": "out",
490-
"path": "/nix/store/s4mr34g8n4pfzz51zanvb5m9y3l96iny-fly-7.12.1",
490+
"path": "/nix/store/5c8fhscc39q9cjj6bdh3qh50kabq3y0b-fly-7.13.0",
491491
"default": true
492492
}
493493
],
494-
"store_path": "/nix/store/s4mr34g8n4pfzz51zanvb5m9y3l96iny-fly-7.12.1"
494+
"store_path": "/nix/store/5c8fhscc39q9cjj6bdh3qh50kabq3y0b-fly-7.13.0"
495495
},
496496
"x86_64-linux": {
497497
"outputs": [
498498
{
499499
"name": "out",
500-
"path": "/nix/store/cd4nvsqg2m5q516mxp3nfwc32ygrm8qg-fly-7.12.1",
500+
"path": "/nix/store/z14jxic9f4jd0szznk5sh5wsb14lpc1v-fly-7.13.0",
501501
"default": true
502502
}
503503
],
504-
"store_path": "/nix/store/cd4nvsqg2m5q516mxp3nfwc32ygrm8qg-fly-7.12.1"
504+
"store_path": "/nix/store/z14jxic9f4jd0szznk5sh5wsb14lpc1v-fly-7.13.0"
505505
}
506506
}
507507
},
@@ -901,51 +901,51 @@
901901
}
902902
}
903903
},
904-
"google-java-format@1.25.2": {
905-
"last_modified": "2025-02-23T09:42:26Z",
906-
"resolved": "github:NixOS/nixpkgs/2d068ae5c6516b2d04562de50a58c682540de9bf#google-java-format",
904+
"google-java-format@1.26.0": {
905+
"last_modified": "2025-03-29T14:41:00Z",
906+
"resolved": "github:NixOS/nixpkgs/eb0e0f21f15c559d2ac7633dc81d079d1caf5f5f#google-java-format",
907907
"source": "devbox-search",
908-
"version": "1.25.2",
908+
"version": "1.26.0",
909909
"systems": {
910910
"aarch64-darwin": {
911911
"outputs": [
912912
{
913913
"name": "out",
914-
"path": "/nix/store/8hhl7mka0a5yja767awfm95qkbm1a69r-google-java-format-1.25.2",
914+
"path": "/nix/store/6frjfyjxlnx9chq663xskkiv0jjm4hpw-google-java-format-1.26.0",
915915
"default": true
916916
}
917917
],
918-
"store_path": "/nix/store/8hhl7mka0a5yja767awfm95qkbm1a69r-google-java-format-1.25.2"
918+
"store_path": "/nix/store/6frjfyjxlnx9chq663xskkiv0jjm4hpw-google-java-format-1.26.0"
919919
},
920920
"aarch64-linux": {
921921
"outputs": [
922922
{
923923
"name": "out",
924-
"path": "/nix/store/d7qga73lwxwdc5hw0i7pjsmma95c2ql5-google-java-format-1.25.2",
924+
"path": "/nix/store/gnmggmmxr5dyjkl8b1822z72wdi4q2ly-google-java-format-1.26.0",
925925
"default": true
926926
}
927927
],
928-
"store_path": "/nix/store/d7qga73lwxwdc5hw0i7pjsmma95c2ql5-google-java-format-1.25.2"
928+
"store_path": "/nix/store/gnmggmmxr5dyjkl8b1822z72wdi4q2ly-google-java-format-1.26.0"
929929
},
930930
"x86_64-darwin": {
931931
"outputs": [
932932
{
933933
"name": "out",
934-
"path": "/nix/store/a0234b777x5f82n35bpbvvzmly6825vq-google-java-format-1.25.2",
934+
"path": "/nix/store/20jv46d3k8wmw9pd07s391zr6dhmh22k-google-java-format-1.26.0",
935935
"default": true
936936
}
937937
],
938-
"store_path": "/nix/store/a0234b777x5f82n35bpbvvzmly6825vq-google-java-format-1.25.2"
938+
"store_path": "/nix/store/20jv46d3k8wmw9pd07s391zr6dhmh22k-google-java-format-1.26.0"
939939
},
940940
"x86_64-linux": {
941941
"outputs": [
942942
{
943943
"name": "out",
944-
"path": "/nix/store/cz1lcxabjdm8wd64mblx5ww7ma35mnf5-google-java-format-1.25.2",
944+
"path": "/nix/store/4c8np7bqn75xks3j76n73s8vwnbk79al-google-java-format-1.26.0",
945945
"default": true
946946
}
947947
],
948-
"store_path": "/nix/store/cz1lcxabjdm8wd64mblx5ww7ma35mnf5-google-java-format-1.25.2"
948+
"store_path": "/nix/store/4c8np7bqn75xks3j76n73s8vwnbk79al-google-java-format-1.26.0"
949949
}
950950
}
951951
},
@@ -1257,7 +1257,7 @@
12571257
}
12581258
}
12591259
},
1260-
"mysql@latest": {
1260+
"mysql@10.6.12": {
12611261
"last_modified": "2023-02-24T09:01:09Z",
12621262
"plugin_version": "0.0.3",
12631263
"resolved": "github:NixOS/nixpkgs/7d0ed7f2e5aea07ab22ccb338d27fbe347ed2f11#mysql",
@@ -1494,51 +1494,51 @@
14941494
}
14951495
}
14961496
},
1497-
"redocly@1.29.0": {
1498-
"last_modified": "2025-03-11T17:52:14Z",
1499-
"resolved": "github:NixOS/nixpkgs/0d534853a55b5d02a4ababa1d71921ce8f0aee4c#redocly",
1497+
"redocly@1.34.0": {
1498+
"last_modified": "2025-04-08T07:10:31Z",
1499+
"resolved": "github:NixOS/nixpkgs/b2b0718004cc9a5bca610326de0a82e6ea75920b#redocly",
15001500
"source": "devbox-search",
1501-
"version": "1.29.0",
1501+
"version": "1.34.0",
15021502
"systems": {
15031503
"aarch64-darwin": {
15041504
"outputs": [
15051505
{
15061506
"name": "out",
1507-
"path": "/nix/store/4fnpw6gk7xq7ym3bf1dxy0yyn84hr87c-redocly-1.29.0",
1507+
"path": "/nix/store/his7h191fwxmzv279rcs3cb8vz77dbpl-redocly-1.34.0",
15081508
"default": true
15091509
}
15101510
],
1511-
"store_path": "/nix/store/4fnpw6gk7xq7ym3bf1dxy0yyn84hr87c-redocly-1.29.0"
1511+
"store_path": "/nix/store/his7h191fwxmzv279rcs3cb8vz77dbpl-redocly-1.34.0"
15121512
},
15131513
"aarch64-linux": {
15141514
"outputs": [
15151515
{
15161516
"name": "out",
1517-
"path": "/nix/store/3yjc6gw3gpjy0rag2ab9839d9lf0lpmx-redocly-1.29.0",
1517+
"path": "/nix/store/1py4fr824zk90041ci8h328q453lad2c-redocly-1.34.0",
15181518
"default": true
15191519
}
15201520
],
1521-
"store_path": "/nix/store/3yjc6gw3gpjy0rag2ab9839d9lf0lpmx-redocly-1.29.0"
1521+
"store_path": "/nix/store/1py4fr824zk90041ci8h328q453lad2c-redocly-1.34.0"
15221522
},
15231523
"x86_64-darwin": {
15241524
"outputs": [
15251525
{
15261526
"name": "out",
1527-
"path": "/nix/store/bfcw1kr9mj9fh9dlh6pm0wnw62bjc7pi-redocly-1.29.0",
1527+
"path": "/nix/store/57qgh22w6a71iiszaywzyc21rlhbg7yc-redocly-1.34.0",
15281528
"default": true
15291529
}
15301530
],
1531-
"store_path": "/nix/store/bfcw1kr9mj9fh9dlh6pm0wnw62bjc7pi-redocly-1.29.0"
1531+
"store_path": "/nix/store/57qgh22w6a71iiszaywzyc21rlhbg7yc-redocly-1.34.0"
15321532
},
15331533
"x86_64-linux": {
15341534
"outputs": [
15351535
{
15361536
"name": "out",
1537-
"path": "/nix/store/31bcz0llbrhvbf4smrvdvhqphnpjhx14-redocly-1.29.0",
1537+
"path": "/nix/store/6hx3pqmdac2xnpd68fcs5fba0pqdailn-redocly-1.34.0",
15381538
"default": true
15391539
}
15401540
],
1541-
"store_path": "/nix/store/31bcz0llbrhvbf4smrvdvhqphnpjhx14-redocly-1.29.0"
1541+
"store_path": "/nix/store/6hx3pqmdac2xnpd68fcs5fba0pqdailn-redocly-1.34.0"
15421542
}
15431543
}
15441544
},

0 commit comments

Comments
 (0)