From c725e441291aec017e7052ba8e776c59a7295764 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@golang.org>
Date: Tue, 1 Jun 2021 10:04:38 -0400
Subject: go.dev: clean up deployment

Delete separate learn service files, since the service has been deleted.
(learn.go.dev is now served by the same service as go.dev.)

Also make the yaml commands a bit more readable.

Change-Id: I8c453cb38bef84eb1d795e949c9bc315360c0deb
Reviewed-on: https://go-review.googlesource.com/c/website/+/323896
Trust: Russ Cox <rsc@golang.org>
Reviewed-by: Jamal Carvalho <jamal@golang.org>
---
 go.dev/.firebaserc            | 6 ------
 go.dev/app.learn.yaml         | 8 --------
 go.dev/app.staging.learn.yaml | 8 --------
 go.dev/app.staging.yaml       | 3 +++
 go.dev/app.yaml               | 5 ++++-
 go.dev/cloudbuild.yaml        | 3 +--
 6 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 go.dev/.firebaserc
 delete mode 100644 go.dev/app.learn.yaml
 delete mode 100644 go.dev/app.staging.learn.yaml

diff --git a/go.dev/.firebaserc b/go.dev/.firebaserc
deleted file mode 100644
index 663d35d0..00000000
--- a/go.dev/.firebaserc
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "projects": {
-    "staging": "go-dev-staging",
-    "prod": "go-dev-prod"
-  }
-}
diff --git a/go.dev/app.learn.yaml b/go.dev/app.learn.yaml
deleted file mode 100644
index 467eb454..00000000
--- a/go.dev/app.learn.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-runtime: go115
-service: learn-go-dev
-main: ./cmd/frontend
-
-handlers:
-  - url: /.*
-    secure: always
-    script: auto
diff --git a/go.dev/app.staging.learn.yaml b/go.dev/app.staging.learn.yaml
deleted file mode 100644
index 6484cc25..00000000
--- a/go.dev/app.staging.learn.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-runtime: go115
-service: staging-learn-go-dev
-main: ./cmd/frontend
-
-handlers:
-  - url: /.*
-    secure: always
-    script: auto
diff --git a/go.dev/app.staging.yaml b/go.dev/app.staging.yaml
index 261d9e9b..65c2d31a 100644
--- a/go.dev/app.staging.yaml
+++ b/go.dev/app.staging.yaml
@@ -1,3 +1,6 @@
+# This app is deployed via Cloud Build as directed by cloudbuild.staging.yaml.
+# Do not deploy directly.
+
 runtime: go115
 service: staging-go-dev
 main: ./cmd/frontend
diff --git a/go.dev/app.yaml b/go.dev/app.yaml
index eb67097a..b9e5b4f3 100644
--- a/go.dev/app.yaml
+++ b/go.dev/app.yaml
@@ -1,6 +1,9 @@
+# This app is deployed via Cloud Build as directed by cloudbuild.yaml.
+# Do not deploy directly.
+
 runtime: go115
 service: go-dev
-main: ./cmd/frontend
+main: ./go.dev/cmd/frontend
 
 handlers:
   - url: /.*
diff --git a/go.dev/cloudbuild.yaml b/go.dev/cloudbuild.yaml
index 2d929189..080164e5 100644
--- a/go.dev/cloudbuild.yaml
+++ b/go.dev/cloudbuild.yaml
@@ -12,8 +12,7 @@ steps:
     dir: go.dev
   - name: "gcr.io/cloud-builders/gcloud"
     entrypoint: bash
-    args: ["../go-app-deploy.sh", "app.yaml"]
-    dir: go.dev
+    args: ["./go-app-deploy.sh", "go.dev/app.yaml"]
   - name: 'mirror.gcr.io/library/golang'
     args: [
       "go", "run", "./cmd/versionprune", "--dry_run=false",
-- 
cgit v1.3