Skip to content

Commit 57dc5f3

Browse files
rcarilrcaril
authored
Merge branch 'main' into rcaril/CDTOOL-1269-refactor-commands-using-old-scenario-framework
2 parents 9a096ee + 0dded03 commit 57dc5f3

7 files changed

Lines changed: 19 additions & 18 deletions

File tree

‎.github/workflows/merge_to_main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Install Go
2525
uses: actions/setup-go@v6
2626
with:
27-
go-version: 1.24.x
27+
go-version: 1.25.x
2828
- name: "Install dependencies"
2929
run: make mod-download
3030
shell: bash

‎.github/workflows/pr_test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Install Go
4646
uses: actions/setup-go@v6
4747
with:
48-
go-version: 1.24.x
48+
go-version: 1.25.x
4949
- name: "Install dependencies"
5050
run: make mod-download
5151
shell: bash
@@ -65,7 +65,7 @@ jobs:
6565
strategy:
6666
matrix:
6767
tinygo-version: [0.31.2]
68-
go-version: [1.24.x]
68+
go-version: [1.25.x]
6969
node-version: [18]
7070
platform: [ubuntu-latest, macos-latest, windows-latest]
7171
runs-on: ${{ matrix.platform }}
@@ -146,7 +146,7 @@ jobs:
146146
- name: Setup Go
147147
uses: actions/setup-go@v6
148148
with:
149-
go-version: 1.24.x
149+
go-version: 1.25.x
150150
- name: Run golangci-lint@latest
151151
id: lint
152152
uses: golangci/golangci-lint-action@v9

‎.github/workflows/tag_to_draft_release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: "Install Go"
1616
uses: actions/setup-go@v6
1717
with:
18-
go-version: '1.24.x'
18+
go-version: '1.25.x'
1919
- name: "Install Rust"
2020
uses: dtolnay/rust-toolchain@stable
2121
- name: "Generate static app config"

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
- fix(manifest): Correct setup.Defined to include checks for ObjectStores and SecretStores ([#1639](https://github.com/fastly/cli/pull/1639))
3434

3535
### Dependencies:
36+
- build(deps): `golang` from 1.24 to 1.25 ([#1651](https://github.com/fastly/cli/pull/1651))
3637
- build(deps): `actions/upload-artifact` from 5 to 6 ([#1603](https://github.com/fastly/cli/pull/1603))
3738
- build(deps): `actions/download-artifact` from 6 to 7 ([#1603](https://github.com/fastly/cli/pull/1603))
3839
- build(deps): `golang.org/x/term` from 0.37.0 to 0.38.0 ([#1602](https://github.com/fastly/cli/pull/1602))

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/fastly/cli
22

3-
go 1.24.0
3+
go 1.25.0
44

5-
toolchain go1.24.3
5+
toolchain go1.25.7
66

77
require (
88
github.com/Masterminds/semver/v3 v3.4.0
@@ -21,7 +21,7 @@ require (
2121
github.com/nicksnyder/go-i18n v1.10.3 // indirect
2222
github.com/pelletier/go-toml v1.9.5
2323
github.com/segmentio/textio v1.2.0
24-
github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80
24+
github.com/tomnomnom/linkheader v0.0.0-20250811210735-e5fe3b51442e
2525
golang.org/x/sys v0.40.0 // indirect
2626
golang.org/x/term v0.39.0
2727
)
@@ -34,7 +34,7 @@ require (
3434
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
3535
github.com/theckman/yacspin v0.13.12
3636
golang.org/x/crypto v0.47.0
37-
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0
37+
golang.org/x/exp v0.0.0-20260112195511-716be5621a96
3838
golang.org/x/mod v0.32.0
3939
)
4040

@@ -82,6 +82,6 @@ require (
8282

8383
require (
8484
4d63.com/optional v0.2.0
85-
github.com/fastly/go-fastly/v12 v12.1.1
85+
github.com/fastly/go-fastly/v12 v12.1.2
8686
github.com/mitchellh/go-ps v1.0.0
8787
)

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj6
2929
github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
3030
github.com/dustinkirkland/golang-petname v0.0.0-20240428194347-eebcea082ee0 h1:aYo8nnk3ojoQkP5iErif5Xxv0Mo0Ga/FR5+ffl/7+Nk=
3131
github.com/dustinkirkland/golang-petname v0.0.0-20240428194347-eebcea082ee0/go.mod h1:8AuBTZBRSFqEYBPYULd+NN474/zZBLP+6WeT5S9xlAc=
32-
github.com/fastly/go-fastly/v12 v12.1.1 h1:yXIUCO3QK+PwR6i+S37Rf0rRAj13MMDpHCWKqqB/fdI=
33-
github.com/fastly/go-fastly/v12 v12.1.1/go.mod h1:ZDNL8lnjIby9HBXgFbEYVjjLYxbAdxB4UOdn727IwKA=
32+
github.com/fastly/go-fastly/v12 v12.1.2 h1:c1Z3t1HtjthfWM9qEMDXPPXFKF1GgKTyXXrQlsRcjek=
33+
github.com/fastly/go-fastly/v12 v12.1.2/go.mod h1:9MSmcSNR/RTJR9rakMO3seZPnRlsx6ndugabPZL1rkk=
3434
github.com/fastly/kingpin v2.1.12-0.20191105091915-95d230a53780+incompatible h1:FhrXlfhgGCS+uc6YwyiFUt04alnjpoX7vgDKJxS6Qbk=
3535
github.com/fastly/kingpin v2.1.12-0.20191105091915-95d230a53780+incompatible/go.mod h1:U8UynVoU1SQaqD2I4ZqgYd5lx3A1ipQYn4aSt2Y5h6c=
3636
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
@@ -143,8 +143,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
143143
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
144144
github.com/theckman/yacspin v0.13.12 h1:CdZ57+n0U6JMuh2xqjnjRq5Haj6v1ner2djtLQRzJr4=
145145
github.com/theckman/yacspin v0.13.12/go.mod h1:Rd2+oG2LmQi5f3zC3yeZAOl245z8QOvrH4OPOJNZxLg=
146-
github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 h1:nrZ3ySNYwJbSpD6ce9duiP+QkD3JuLCcWkdaehUS/3Y=
147-
github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80/go.mod h1:iFyPdL66DjUD96XmzVL3ZntbzcflLnznH0fr99w5VqE=
146+
github.com/tomnomnom/linkheader v0.0.0-20250811210735-e5fe3b51442e h1:tD38/4xg4nuQCASJ/JxcvCHNb46w0cdAaJfkzQOO1bA=
147+
github.com/tomnomnom/linkheader v0.0.0-20250811210735-e5fe3b51442e/go.mod h1:krvJ5AY/MjdPkTeRgMYbIDhbbbVvnPQPzsIsDJO8xrY=
148148
github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
149149
github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
150150
github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
@@ -159,8 +159,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
159159
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
160160
golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
161161
golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
162-
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
163-
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
162+
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 h1:Z/6YuSHTLOHfNFdb8zVZomZr7cqNgTJvA8+Qz75D8gU=
163+
golang.org/x/exp v0.0.0-20260112195511-716be5621a96/go.mod h1:nzimsREAkjBCIEFtHiYkrJyT+2uy9YZJB7H1k68CXZU=
164164
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
165165
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
166166
golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=

‎tools.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/fastly/cli/tools
22

3-
go 1.24.0
3+
go 1.25.0
44

5-
toolchain go1.24.3
5+
toolchain go1.25.7
66

77
tool (
88
github.com/goreleaser/goreleaser/v2

0 commit comments

Comments
 (0)