Skip to content

Commit

Permalink
Move the internal build scripts to the fastly.toml manifest (#640)
Browse files Browse the repository at this point in the history
* bump go-fastly

* remove deprecated toolchain_version

* reword Scripts description

* add ToolchainValidator type

* fix merge conflict 1

* fix tests

* go 1.18

* fix conflict of regions in run_test

* fix conflict with run_test output needing to be deleted

* remove other redundant fields

* skip windows running tests that use a subprocess

* pass manifest reference so file can be updated with default build script

* bad rebase put this back in

* add missing public type comment

* suggested edits

* fix tests

* notifier for patched manifest

* address Andrew's requested changes

* fix some bugs after manual testing a deployment

* fix test to work in ci where there is didn't rust version

* fix test for windows platform

* rename variable

* document how examples are added to devhub

* rename method
  • Loading branch information
Integralist authored Sep 29, 2022
1 parent e856f47 commit b294e4c
Show file tree
Hide file tree
Showing 35 changed files with 1,634 additions and 7,141 deletions.
3 changes: 0 additions & 3 deletions .fastly/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,8 @@ ttl = "5m"
toolchain_constraint = ">= 1.17 < 1.19" # upper limit should be temporary (just while we figure out any rough edges)

[language.rust]
toolchain_version = "1.56.1"
toolchain_constraint = ">= 1.56.1"
wasm_wasi_target = "wasm32-wasi"
fastly_sys_constraint = ">= 0.3.3"
rustup_constraint = ">= 1.23.0"

[viceroy]
ttl = "24h"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.19.x
go-version: 1.18.x
- name: "Restore golang bin cache"
id: go-bin-cache
uses: actions/cache@v2
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
strategy:
matrix:
tinygo-version: [0.24.0]
go-version: [1.19.x]
go-version: [1.18.x]
node-version: [12]
rust-toolchain: [stable]
platform: [ubuntu-latest, macos-latest, windows-latest]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: "Install Go"
uses: actions/setup-go@v2
with:
go-version: '1.19.x'
go-version: '1.18.x'
- name: "Set GOHOSTOS and GOHOSTARCH"
run: echo "GOHOSTOS=$(go env GOHOSTOS)" >> $GITHUB_ENV && echo "GOHOSTARCH=$(go env GOHOSTARCH)" >> $GITHUB_ENV
- name: "Download latest app config"
Expand Down
7 changes: 7 additions & 0 deletions DOCUMENTATION.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
## Documentation

The help output from the Fastly CLI is consumed by the Fastly Developer Hub to produce online documentation: https://developer.fastly.com/reference/cli/

Part of the documentation is to provide additional usage examples and links to APIs used by the CLI commands (example: https://developer.fastly.com/reference/cli/backend/create/#examples).

These examples and API references are defined in [`pkg/app/metadata.json`](./pkg/app/metadata.json).
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
- [Commands](https://developer.fastly.com/reference/cli/#command-groups)
- [Development](DEVELOP.md)
- [Testing](TESTING.md)
- [Documentation](DOCUMENTATION.md)

## Contributing

Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module github.com/fastly/cli

go 1.19
go 1.18

require (
github.com/Masterminds/semver/v3 v3.1.1
github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 // indirect
github.com/bep/debounce v1.2.0
github.com/blang/semver v3.5.1+incompatible
github.com/dustinkirkland/golang-petname v0.0.0-20191129215211-8e5a1ed0cff0
github.com/fastly/go-fastly/v6 v6.5.1
github.com/fastly/go-fastly/v6 v6.5.2
github.com/fastly/kingpin v2.1.12-0.20191105091915-95d230a53780+incompatible
github.com/fatih/color v1.13.0
github.com/frankban/quicktest v1.13.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ github.com/dustinkirkland/golang-petname v0.0.0-20191129215211-8e5a1ed0cff0/go.m
github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
github.com/fastly/go-fastly/v6 v6.5.1 h1:l/E99Kj1V+o3om74lIibAdZRONC0YZnYgWFPrTEVWDA=
github.com/fastly/go-fastly/v6 v6.5.1/go.mod h1:NrIbx45etTFv35rgfRe+eQY+8kA47arWABIkOaQ+roY=
github.com/fastly/go-fastly/v6 v6.5.2 h1:oeHoRoddStqHn1Ukyz+oVxPjvYDBARNr+hP6+HAt4TY=
github.com/fastly/go-fastly/v6 v6.5.2/go.mod h1:NrIbx45etTFv35rgfRe+eQY+8kA47arWABIkOaQ+roY=
github.com/fastly/kingpin v2.1.12-0.20191105091915-95d230a53780+incompatible h1:FhrXlfhgGCS+uc6YwyiFUt04alnjpoX7vgDKJxS6Qbk=
github.com/fastly/kingpin v2.1.12-0.20191105091915-95d230a53780+incompatible/go.mod h1:U8UynVoU1SQaqD2I4ZqgYd5lx3A1ipQYn4aSt2Y5h6c=
github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
Expand Down
Loading

0 comments on commit b294e4c

Please sign in to comment.