Skip to content
This repository has been archived by the owner on Mar 17, 2022. It is now read-only.

Commit

Permalink
build: fix deploy target for Makefile
Browse files Browse the repository at this point in the history
Because the go.mod and related files were not being copying, the
packages are resolved within the current $GOROOT, which does not work.

This change copies all application files, not just Go source files and
app.yaml.
  • Loading branch information
amscanne authored and ianlewis committed May 7, 2019
1 parent 0b4eca7 commit 0f5e7e0
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions Makefile
Expand Up @@ -5,21 +5,19 @@ NPM := npm
GCLOUD := gcloud
GCP_PROJECT := gvisor-website

# Source Go files. example: main.go foo/bar.go
GO_SOURCE = $(shell find cmd/gvisor-website -type f -name "*.go" | sed 's/ /\\ /g')
# Target Go files. example: public/main.go public/foo/bar.go
GO_TARGET = $(shell cd cmd/gvisor-website && find . -type f -name "*.go" | sed 's/ /\\ /g' | sed 's/^.\//public\//')
# Source Go files, example: main.go, foo/bar.go.
APP_SOURCE = $(wildcard cmd/gvisor-website/*)
# Target Go files, example: public/main.go, public/foo/bar.go.
APP_TARGET = $(patsubst cmd/gvisor-website/%,public/%,$(APP_SOURCE))

default: website
.PHONY: default

website: all-upstream public/app.yaml $(GO_TARGET) public/static
website: all-upstream $(APP_TARGET) public/static
.PHONY: website

public:
mkdir -p public
public/app.yaml: public
cp -vr cmd/gvisor-website/app.yaml public/

# Load repositories.
upstream:
Expand All @@ -39,8 +37,8 @@ content/docs/community/sigs: upstream/community $(wildcard upstream/community/si
cat upstream/community/sigs/$$file.md |grep -v -E '^# ' >> content/docs/community/sigs/$$file.md; \
done

$(GO_TARGET): public $(GO_SOURCE)
cd cmd/gvisor-website && find . -name "*.go" -exec cp --parents \{\} ../../public \;
$(APP_TARGET): public $(APP_SOURCE)
cp -a cmd/gvisor-website/$(patsubst public/%,%,$@) public/

public/static: node_modules config.toml $(shell find archetypes assets content themes -type f | sed 's/ /\\ /g')
HUGO_ENV="production" $(HUGO)
Expand All @@ -56,7 +54,7 @@ server: all-upstream
.PHONY: server

# Deploy the website to App Engine.
deploy: public/app.yaml
deploy: $(APP_TARGET)
cd public && $(GCLOUD) app deploy
.PHONY: deploy

Expand Down

0 comments on commit 0f5e7e0

Please sign in to comment.