Skip to content

Commit f0c46a4

Browse files
authored
Postcss Fix (#201)
* Installed postcss-scss module. Added version changes for new release to resolve previous PR * Disabled site-test target until future update
1 parent 3db0f01 commit f0c46a4

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
lines changed

Makefile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# If you want information on how to edit this file checkout,
2525
# http://makefiletutorial.com/
2626

27-
BASE_VERSION = 1.0.0
27+
BASE_VERSION = 1.1.0
2828
SHORT_SHA = $(shell git rev-parse --short=7 HEAD | tr -d [:punct:])
2929
VERSION_SUFFIX = $(SHORT_SHA)
3030
BRANCH_NAME = $(shell git rev-parse --abbrev-ref HEAD | tr -d [:punct:])
@@ -204,6 +204,7 @@ node_modules/: build/toolchain/nodejs/
204204
-rm -r $(REPOSITORY_ROOT)/package.json $(REPOSITORY_ROOT)/package-lock.json
205205
-rm -rf $(REPOSITORY_ROOT)/node_modules/
206206
echo "{}" > $(REPOSITORY_ROOT)/package.json
207+
$(NODEJS_BIN)/npm install postcss-scss
207208
$(NODEJS_BIN)/npm install postcss-cli autoprefixer
208209
$(TOOLCHAIN_DIR)/nodejs/bin/npm install postcss-cli autoprefixer
209210

@@ -232,12 +233,12 @@ site/static/swaggerui/:
232233
md-test: docker
233234
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*'`
234235

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)
241242

242243
browse-site: $(RENDERED_SITE_DIR_REL)/
243244
cd $(RENDERED_SITE_DIR) && dev_appserver.py .app.yaml

cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ steps:
113113
path: '/go'
114114

115115
substitutions:
116-
_OM_VERSION: "1.0.0"
116+
_OM_VERSION: "1.1.0"
117117
_GCB_POST_SUBMIT: "0"
118118
_GCB_LATEST_VERSION: "undefined"
119119
logsBucket: 'gs://open-match-site-build-logs/'

site/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ github_docs_repo = "https://github.com/googleforgames/open-match-docs"
7474
gcs_engine_id = "008748710159674449076:sqoelpnrdoe"
7575

7676
release_branch = "master"
77-
release_version = "1.0.0"
77+
release_version = "1.1.0"
7878
slack_link = "https://join.slack.com/t/open-match/shared_invite/enQtNDM1NjcxNTY4MTgzLTM5ZWQxNjc1YWI3MzJmN2RiMWJmYWI0ZjFiNzNkZmNkMWQ3YWU5OGVkNzA5Yzc4OGVkOGU5MTc0OTA5ZTA5NDU"
7979

8080
# User interface configuration

site/static/swaggerui/config.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"urls": [
3-
{"name": "Frontend", "url": "https://open-match.dev/api/v1.0.0/frontend.swagger.json"},
4-
{"name": "Backend", "url": "https://open-match.dev/api/v1.0.0/backend.swagger.json"},
5-
{"name": "Query", "url": "https://open-match.dev/api/v1.0.0/query.swagger.json"},
6-
{"name": "MatchFunction", "url": "https://open-match.dev/api/v1.0.0/matchfunction.swagger.json"},
7-
{"name": "Synchronizer", "url": "https://open-match.dev/api/v1.0.0/synchronizer.swagger.json"},
8-
{"name": "Evaluator", "url": "https://open-match.dev/api/v1.0.0/evaluator.swagger.json"}
3+
{"name": "Frontend", "url": "https://open-match.dev/api/v1.1.0/frontend.swagger.json"},
4+
{"name": "Backend", "url": "https://open-match.dev/api/v1.1.0/backend.swagger.json"},
5+
{"name": "Query", "url": "https://open-match.dev/api/v1.1.0/query.swagger.json"},
6+
{"name": "MatchFunction", "url": "https://open-match.dev/api/v1.1.0/matchfunction.swagger.json"},
7+
{"name": "Synchronizer", "url": "https://open-match.dev/api/v1.1.0/synchronizer.swagger.json"},
8+
{"name": "Evaluator", "url": "https://open-match.dev/api/v1.1.0/evaluator.swagger.json"}
99
]
1010
}

0 commit comments

Comments
 (0)