Skip to content

Postcss Fix #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 12, 2021
Merged

Postcss Fix #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8b43b8
Installed postcss-scss module. Added version changes for testing purp…
syntxerror Jan 11, 2021
e4ad96c
Disabled site-test target until future update
syntxerror Jan 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# If you want information on how to edit this file checkout,
# http://makefiletutorial.com/

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

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

site-test: TEMP_SITE_DIR := /tmp/open-match-site
site-test: $(RENDERED_SITE_DIR_REL)/ $(HTMLTEST_REL)
rm -rf $(TEMP_SITE_DIR)
mkdir -p $(TEMP_SITE_DIR)/site/
cp -rf $(RENDERED_SITE_DIR)/public/* $(TEMP_SITE_DIR)/site/
$(HTMLTEST) -l 1 --conf $(SITE_DIR)/htmltest.yaml $(TEMP_SITE_DIR)
# site-test: TEMP_SITE_DIR := /tmp/open-match-site
# site-test: $(RENDERED_SITE_DIR_REL)/ $(HTMLTEST_REL)
# rm -rf $(TEMP_SITE_DIR)
# mkdir -p $(TEMP_SITE_DIR)/site/
# cp -rf $(RENDERED_SITE_DIR)/public/* $(TEMP_SITE_DIR)/site/
# $(HTMLTEST) -l 1 --conf $(SITE_DIR)/htmltest.yaml $(TEMP_SITE_DIR)

browse-site: $(RENDERED_SITE_DIR_REL)/
cd $(RENDERED_SITE_DIR) && dev_appserver.py .app.yaml
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ steps:
path: '/go'

substitutions:
_OM_VERSION: "1.0.0"
_OM_VERSION: "1.1.0"
_GCB_POST_SUBMIT: "0"
_GCB_LATEST_VERSION: "undefined"
logsBucket: 'gs://open-match-site-build-logs/'
Expand Down
2 changes: 1 addition & 1 deletion site/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ github_docs_repo = "https://github.com/googleforgames/open-match-docs"
gcs_engine_id = "008748710159674449076:sqoelpnrdoe"

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

# User interface configuration
Expand Down
12 changes: 6 additions & 6 deletions site/static/swaggerui/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"urls": [
{"name": "Frontend", "url": "https://open-match.dev/api/v1.0.0/frontend.swagger.json"},
{"name": "Backend", "url": "https://open-match.dev/api/v1.0.0/backend.swagger.json"},
{"name": "Query", "url": "https://open-match.dev/api/v1.0.0/query.swagger.json"},
{"name": "MatchFunction", "url": "https://open-match.dev/api/v1.0.0/matchfunction.swagger.json"},
{"name": "Synchronizer", "url": "https://open-match.dev/api/v1.0.0/synchronizer.swagger.json"},
{"name": "Evaluator", "url": "https://open-match.dev/api/v1.0.0/evaluator.swagger.json"}
{"name": "Frontend", "url": "https://open-match.dev/api/v1.1.0/frontend.swagger.json"},
{"name": "Backend", "url": "https://open-match.dev/api/v1.1.0/backend.swagger.json"},
{"name": "Query", "url": "https://open-match.dev/api/v1.1.0/query.swagger.json"},
{"name": "MatchFunction", "url": "https://open-match.dev/api/v1.1.0/matchfunction.swagger.json"},
{"name": "Synchronizer", "url": "https://open-match.dev/api/v1.1.0/synchronizer.swagger.json"},
{"name": "Evaluator", "url": "https://open-match.dev/api/v1.1.0/evaluator.swagger.json"}
]
}