go.dev: update README and cloudbuild yaml files
Change-Id: I6c6c9a605e831bb4a67f5b4a50b5545f29bb957b
Reviewed-on: https://go-review.googlesource.com/c/website/+/322969
Trust: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Jamal Carvalho <jamal@golang.org>
diff --git a/go.dev/README.md b/go.dev/README.md
index ae44e73..c171005 100644
--- a/go.dev/README.md
+++ b/go.dev/README.md
@@ -1,16 +1,5 @@
# go.dev
-## Contributing
-
-```
-git clone sso://partner-code/go.dev && (cd go.dev && f=`git rev-parse --git-dir`/hooks/commit-msg ; mkdir -p $(dirname $f) ; curl -Lo $f https://gerrit-review.googlesource.com/tools/hooks/commit-msg ; chmod +x $f)
-```
-
-- `data/learn` contains links for the Learn pages, as all content is currently external.
-- `content/solutions` contains Use Cases and Case Studies.
- - Please include relevant resources using the same `name` attribute for images.
-- `themes/default` contains the site layout.
-
### Style Guides
- [CSS](https://golang.org/wiki/CSSStyleGuide)
@@ -24,25 +13,13 @@
## Deploying
-All commits targeting `master` will trigger a CI test defined in `cloudbuild.ci.yaml`.
-All commits pushed to `master` will be automatically deployed to https://dev.go.dev.
+All commits pushed to `master` will be automatically deployed to https://go.dev.
-## Code repo
-
-https://partner-code.git.corp.google.com/go.dev
+For now moment, the deployment is not automatic. Instead, after submitting,
+visit the [Cloud Build triggers list](https://console.cloud.google.com/cloud-build/triggers?project=go-discovery),
+find the one named “Redeploy-go-dev-on-website-commit”, which should say “Disabled” in the status column,
+and then click “RUN”.
## Commands
- Running the server: `go run ./cmd/frontend`
-- Pushing to staging: `git push -f origin HEAD:staging`
-
-## Where things live
-
-- Javascript:
-- Carousels: /static/js/carousels.js
-- Tab navigation, filtering, listeners: /static/js/site.js
-- Solutions page template: /layouts/solutions/single.html
-- Home page template: /layouts/index.html
-- Site wide styles: /assets/css/styles.css
-- Site configuration: /config.toml
-- Promotional components (modal, snackbar, etc) are in this branch: `messaging-components`
diff --git a/go.dev/app.learn.yaml b/go.dev/app.learn.yaml
index 115fb42..467eb45 100644
--- a/go.dev/app.learn.yaml
+++ b/go.dev/app.learn.yaml
@@ -1,4 +1,4 @@
-runtime: go113
+runtime: go115
service: learn-go-dev
main: ./cmd/frontend
diff --git a/go.dev/app.staging.learn.yaml b/go.dev/app.staging.learn.yaml
index d207f22..6484cc2 100644
--- a/go.dev/app.staging.learn.yaml
+++ b/go.dev/app.staging.learn.yaml
@@ -1,4 +1,4 @@
-runtime: go113
+runtime: go115
service: staging-learn-go-dev
main: ./cmd/frontend
diff --git a/go.dev/app.staging.yaml b/go.dev/app.staging.yaml
index 4430cea..261d9e9 100644
--- a/go.dev/app.staging.yaml
+++ b/go.dev/app.staging.yaml
@@ -1,4 +1,4 @@
-runtime: go113
+runtime: go115
service: staging-go-dev
main: ./cmd/frontend
diff --git a/go.dev/app.yaml b/go.dev/app.yaml
index c21497d..eb67097 100644
--- a/go.dev/app.yaml
+++ b/go.dev/app.yaml
@@ -1,4 +1,4 @@
-runtime: go113
+runtime: go115
service: go-dev
main: ./cmd/frontend
diff --git a/go.dev/cloudbuild.ci.yaml b/go.dev/cloudbuild.ci.yaml
deleted file mode 100644
index 3c494ef..0000000
--- a/go.dev/cloudbuild.ci.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-steps:
- - name: 'mirror.gcr.io/library/golang'
- entrypoint: bash
- args:
- - -c
- - go test ./...
- - name: 'mirror.gcr.io/library/golang'
- entrypoint: bash
- args:
- - -c
- - go run ./cmd/events/ > ./_content/events.yaml
diff --git a/go.dev/cloudbuild.staging.yaml b/go.dev/cloudbuild.staging.yaml
index f6f473d..0a61208 100644
--- a/go.dev/cloudbuild.staging.yaml
+++ b/go.dev/cloudbuild.staging.yaml
@@ -4,11 +4,21 @@
args:
- -c
- go run ./cmd/events/ > ./_content/events.yaml
+ dir: go.dev
+ - name: 'mirror.gcr.io/library/golang'
+ args:
+ - test
+ - ./...
+ dir: go.dev
- name: "gcr.io/cloud-builders/gcloud"
args: ["app", "deploy", "app.staging.yaml"]
+ dir: go.dev
- name: "gcr.io/cloud-builders/gcloud"
args: ["app", "deploy", "app.staging.learn.yaml"]
+ dir: go.dev
- name: 'mirror.gcr.io/library/golang'
args: ["go", "run", "./cmd/versionprune", "--project=$PROJECT_ID", "--service=staging-go-dev", "--dry_run=false"]
+ dir: go.dev
- name: 'mirror.gcr.io/library/golang'
args: ["go", "run", "./cmd/versionprune", "--project=$PROJECT_ID", "--service=staging-learn-go-dev", "--dry_run=false"]
+ dir: go.dev
diff --git a/go.dev/cloudbuild.yaml b/go.dev/cloudbuild.yaml
index bdf18ad..50bef8c 100644
--- a/go.dev/cloudbuild.yaml
+++ b/go.dev/cloudbuild.yaml
@@ -4,11 +4,21 @@
args:
- -c
- go run ./cmd/events/ > ./_content/events.yaml
+ dir: go.dev
+ - name: 'mirror.gcr.io/library/golang'
+ args:
+ - test
+ - ./...
+ dir: go.dev
- name: "gcr.io/cloud-builders/gcloud"
args: ["app", "deploy"]
+ dir: go.dev
- name: "gcr.io/cloud-builders/gcloud"
args: ["app", "deploy", "app.learn.yaml"]
+ dir: go.dev
- name: 'mirror.gcr.io/library/golang'
args: ["go", "run", "./cmd/versionprune", "--project=$PROJECT_ID", "--service=go-dev", "--dry_run=false"]
+ dir: go.dev
- name: 'mirror.gcr.io/library/golang'
args: ["go", "run", "./cmd/versionprune", "--project=$PROJECT_ID", "--service=learn-go-dev", "--dry_run=false"]
+ dir: go.dev
