Copy app engine app files in cloudbuild

Fixes website deploy step
This commit is contained in:
Ian Lewis
2019-07-10 14:33:56 +09:00
committed by Ian Lewis
parent 6714bee53b
commit 8a64125647
4 changed files with 15 additions and 9 deletions
+5 -2
View File
@@ -14,9 +14,12 @@ APP_TARGET = $(patsubst cmd/gvisor-website/%,public/%,$(APP_SOURCE))
default: website
.PHONY: default
website: all-upstream $(APP_TARGET) public/static
website: all-upstream app public/static
.PHONY: website
app: $(APP_TARGET)
.PHONY: app
public:
mkdir -p public
@@ -56,9 +59,9 @@ bin/generate-syscall-docs: $(GEN_SOURCE)
mkdir -p bin/
go build -o bin/generate-syscall-docs gvisor.dev/website/cmd/generate-syscall-docs
.PHONY: compatibility-docs
compatibility-docs: bin/generate-syscall-docs upstream/gvisor/bazel-bin/runsc/linux_amd64_pure_stripped/runsc
./upstream/gvisor/bazel-bin/runsc/linux_amd64_pure_stripped/runsc help syscalls -o json | ./bin/generate-syscall-docs -out ./content/docs/user_guide/compatibility/
.PHONY: compatibility-docs
# Run a local content development server. Redirects will not be supported.
server: all-upstream compatibility-docs
+9 -6
View File
@@ -24,7 +24,7 @@ steps:
dir: 'upstream'
# Build runsc
- name: 'gcr.io/cloud-builders/bazel'
args:
args:
- 'build'
- '--show_timestamps'
- '--test_output=errors'
@@ -35,7 +35,7 @@ steps:
# Build the compatibility doc generator tool
- name: 'golang'
env: ['GO111MODULE=on']
args:
args:
- 'go'
- 'build'
- '-o'
@@ -43,22 +43,25 @@ steps:
- 'gvisor.dev/website/cmd/generate-syscall-docs'
# Generate compatibility docs.
- name: 'bash'
args:
args:
- 'bash'
- '-c'
- >
- >
./upstream/gvisor/bazel-bin/runsc/linux_amd64_pure_stripped/runsc help syscalls -o json |
./bin/generate-syscall-docs -out ./content/docs/user_guide/compatibility/
# Pull npm dependencies for scss
- name: 'gcr.io/cloud-builders/npm'
args: ['ci']
# Copy App Engine app files.
- name: 'gcr.io/gvisor-website/hugo:0.53'
args: ["make", "app"]
# Generate the website.
- name: 'gcr.io/gvisor-website/hugo:0.53'
env: ['HUGO_ENV=production']
args: ["hugo"]
# Test the HTML for issues.
- name: 'gcr.io/gvisor-website/html-proofer:3.10.2'
args:
args:
- "htmlproofer"
- "--disable-external"
- "--check-html"
@@ -66,7 +69,7 @@ steps:
# Deploy to App Engine only for master branch.
- name: 'gcr.io/cloud-builders/gcloud'
entrypoint: 'bash'
args:
args:
- '-c'
- >
if [[ "$PROJECT_ID" == "gvisor-website" && "$BRANCH_NAME" == "master" ]]; then
@@ -0,0 +1 @@
linux
@@ -1 +0,0 @@
amd64.md