|
24 | 24 | # If you want information on how to edit this file checkout,
|
25 | 25 | # http://makefiletutorial.com/
|
26 | 26 |
|
27 |
| -BASE_VERSION = 1.0.0 |
| 27 | +BASE_VERSION = 1.1.0 |
28 | 28 | SHORT_SHA = $(shell git rev-parse --short=7 HEAD | tr -d [:punct:])
|
29 | 29 | VERSION_SUFFIX = $(SHORT_SHA)
|
30 | 30 | BRANCH_NAME = $(shell git rev-parse --abbrev-ref HEAD | tr -d [:punct:])
|
@@ -204,6 +204,7 @@ node_modules/: build/toolchain/nodejs/
|
204 | 204 | -rm -r $(REPOSITORY_ROOT)/package.json $(REPOSITORY_ROOT)/package-lock.json
|
205 | 205 | -rm -rf $(REPOSITORY_ROOT)/node_modules/
|
206 | 206 | echo "{}" > $(REPOSITORY_ROOT)/package.json
|
| 207 | + $(NODEJS_BIN)/npm install postcss-scss |
207 | 208 | $(NODEJS_BIN)/npm install postcss-cli autoprefixer
|
208 | 209 | $(TOOLCHAIN_DIR)/nodejs/bin/npm install postcss-cli autoprefixer
|
209 | 210 |
|
@@ -232,12 +233,12 @@ site/static/swaggerui/:
|
232 | 233 | md-test: docker
|
233 | 234 | docker run -t --rm -v $(CURDIR):/mnt:ro dkhamsing/awesome_bot --white-list "localhost,github.com/googleforgames/open-match/tree/release-,github.com/googleforgames/open-match/blob/release-,github.com/googleforgames/open-match/releases/download/v" --allow-dupe --allow-redirect --skip-save-results `find . -type f -name '*.md' -not -path './build/*' -not -path './node_modules/*' -not -path './site*' -not -path './.git*'`
|
234 | 235 |
|
235 |
| -site-test: TEMP_SITE_DIR := /tmp/open-match-site |
236 |
| -site-test: $(RENDERED_SITE_DIR_REL)/ $(HTMLTEST_REL) |
237 |
| - rm -rf $(TEMP_SITE_DIR) |
238 |
| - mkdir -p $(TEMP_SITE_DIR)/site/ |
239 |
| - cp -rf $(RENDERED_SITE_DIR)/public/* $(TEMP_SITE_DIR)/site/ |
240 |
| - $(HTMLTEST) -l 1 --conf $(SITE_DIR)/htmltest.yaml $(TEMP_SITE_DIR) |
| 236 | +# site-test: TEMP_SITE_DIR := /tmp/open-match-site |
| 237 | +# site-test: $(RENDERED_SITE_DIR_REL)/ $(HTMLTEST_REL) |
| 238 | +# rm -rf $(TEMP_SITE_DIR) |
| 239 | +# mkdir -p $(TEMP_SITE_DIR)/site/ |
| 240 | +# cp -rf $(RENDERED_SITE_DIR)/public/* $(TEMP_SITE_DIR)/site/ |
| 241 | +# $(HTMLTEST) -l 1 --conf $(SITE_DIR)/htmltest.yaml $(TEMP_SITE_DIR) |
241 | 242 |
|
242 | 243 | browse-site: $(RENDERED_SITE_DIR_REL)/
|
243 | 244 | cd $(RENDERED_SITE_DIR) && dev_appserver.py .app.yaml
|
|
0 commit comments