From e6e277bd97bb76c6c6ae335e4cfad0da2c27a18a Mon Sep 17 00:00:00 2001 From: Jon Foust Date: Thu, 15 Apr 2021 14:49:58 -0400 Subject: [PATCH 1/3] update versioning across files on master --- Makefile | 2 +- cloudbuild.yaml | 2 +- site/config.toml | 2 +- site/static/swaggerui/config.json | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 076ed27d..f3ae6f28 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ # If you want information on how to edit this file checkout, # http://makefiletutorial.com/ -BASE_VERSION = 1.1.0 +BASE_VERSION = 1.2.0-rc.1 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:]) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 6f0f1694..59cbdd36 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -113,7 +113,7 @@ steps: path: '/go' substitutions: - _OM_VERSION: "1.1.0" + _OM_VERSION: "1.2.0-rc.1" _GCB_POST_SUBMIT: "0" _GCB_LATEST_VERSION: "undefined" logsBucket: 'gs://open-match-site-build-logs/' diff --git a/site/config.toml b/site/config.toml index 29c6d998..3d0cfab4 100644 --- a/site/config.toml +++ b/site/config.toml @@ -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.1.0" +release_version = "1.2.0-rc.1" slack_link = "https://join.slack.com/t/open-match/shared_invite/enQtNDM1NjcxNTY4MTgzLTM5ZWQxNjc1YWI3MzJmN2RiMWJmYWI0ZjFiNzNkZmNkMWQ3YWU5OGVkNzA5Yzc4OGVkOGU5MTc0OTA5ZTA5NDU" # User interface configuration diff --git a/site/static/swaggerui/config.json b/site/static/swaggerui/config.json index de4b9d06..7d690496 100644 --- a/site/static/swaggerui/config.json +++ b/site/static/swaggerui/config.json @@ -1,10 +1,10 @@ { "urls": [ - {"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"} + {"name": "Frontend", "url": "https://open-match.dev/api/v1.2.0-rc.1/frontend.swagger.json"}, + {"name": "Backend", "url": "https://open-match.dev/api/v1.2.0-rc.1/backend.swagger.json"}, + {"name": "Query", "url": "https://open-match.dev/api/v1.2.0-rc.1/query.swagger.json"}, + {"name": "MatchFunction", "url": "https://open-match.dev/api/v1.2.0-rc.1/matchfunction.swagger.json"}, + {"name": "Synchronizer", "url": "https://open-match.dev/api/v1.2.0-rc.1/synchronizer.swagger.json"}, + {"name": "Evaluator", "url": "https://open-match.dev/api/v1.2.0-rc.1/evaluator.swagger.json"} ] } \ No newline at end of file From d1927b1726384a444fcc282fa0d3dd1267ef8c33 Mon Sep 17 00:00:00 2001 From: Jon Foust Date: Mon, 6 Jun 2022 13:56:03 -0400 Subject: [PATCH 2/3] add link to values.yaml for config customization --- site/content/en/docs/Installation/helm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/Installation/helm.md b/site/content/en/docs/Installation/helm.md index b6197b03..d36a4f4b 100644 --- a/site/content/en/docs/Installation/helm.md +++ b/site/content/en/docs/Installation/helm.md @@ -76,7 +76,7 @@ helm install --name open-match --namespace open-match open-match/open-match \ The above command sets the namespace where Open Match is deployed to `open-match`. Additionally turn on the telemetry exporters and deploy Jaeger along with Open Match core services. -The following tables lists the configurable parameters of the Open Match chart and their default values. +The following tables lists the configurable parameters of the Open Match chart and their default values. Refer to the [Values.yaml] (https://github.com/googleforgames/open-match/blob/main/install/helm/open-match/values.yaml) file to customize your configs. | Parameter | Description | Default | | --------------------------------------------------- | ----------------------------------------------------------------------------------------------- | ---------------------- | From 48f7c9f27426462bc43e7ad4124cbec5e762b6d8 Mon Sep 17 00:00:00 2001 From: Jon Foust Date: Mon, 6 Jun 2022 18:02:07 -0400 Subject: [PATCH 3/3] rebase --- Makefile | 12 +++++++----- cloudbuild.yaml | 2 +- site/config.toml | 4 ++-- site/static/swaggerui/config.json | 12 ++++++------ 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 2fd1b477..ee2961a2 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ # If you want information on how to edit this file checkout, # http://makefiletutorial.com/ -BASE_VERSION = 1.2.0 +BASE_VERSION = 1.3.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:]) @@ -33,8 +33,8 @@ BUILD_DATE = $(shell date -u +'%Y-%m-%dT%H:%M:%SZ') YEAR_MONTH = $(shell date -u +'%Y%m') MAJOR_MINOR_VERSION = $(shell echo $(BASE_VERSION) | cut -d '.' -f1).$(shell echo $(BASE_VERSION) | cut -d '.' -f2) -HUGO_VERSION = 0.55.6 -NODEJS_VERSION = 10.16.0 +HUGO_VERSION = 0.82.1 +NODEJS_VERSION = 16.13.2 HTMLTEST_VERSION = 0.10.3 GOLANGCI_VERSION = 1.17.1 SWAGGERUI_VERSION = 3.22.3 @@ -79,7 +79,7 @@ GAE_SITE_VERSION = om$(YEAR_MONTH) # If the version is 0.0* then the service name is "development" as in development.open-match.dev. ifeq ($(MAJOR_MINOR_VERSION),0.0) GAE_SERVICE_NAME = development - OPEN_MATCH_REMOTE_BRANCH = master + OPEN_MATCH_REMOTE_BRANCH = main else GAE_SERVICE_NAME = $(shell echo $(MAJOR_MINOR_VERSION) | tr . -) OPEN_MATCH_REMOTE_BRANCH = release-$(MAJOR_MINOR_VERSION) @@ -204,9 +204,11 @@ 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 $(NODEJS_BIN)/npm install postcss-scss $(NODEJS_BIN)/npm install postcss-cli autoprefixer $(TOOLCHAIN_DIR)/nodejs/bin/npm install postcss-cli autoprefixer + $(TOOLCHAIN_DIR)/nodejs/bin/npm install ts-node $(RENDERED_SITE_DIR_REL)/: $(HUGO_REL) site/static/swaggerui/ node_modules/ rm -rf $(RENDERED_SITE_DIR)/ @@ -304,7 +306,7 @@ update-deps: cd $(SITE_DIR) && $(GO) mod tidy sync-deps: - cd $(SITE_DIR) && $(GO) mod download + cd $(SITE_DIR) && GIT_SSL_NO_VERIFY=1 $(GO) mod download # Prevents users from running with sudo. # There's an exception for Google Cloud Build because it runs as root. diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 4253d9c5..b8f17c64 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -113,7 +113,7 @@ steps: path: '/go' substitutions: - _OM_VERSION: "1.2.0" + _OM_VERSION: "1.3.0" _GCB_POST_SUBMIT: "0" _GCB_LATEST_VERSION: "undefined" logsBucket: 'gs://open-match-site-build-logs/' diff --git a/site/config.toml b/site/config.toml index 4c7f3189..169b0889 100644 --- a/site/config.toml +++ b/site/config.toml @@ -73,8 +73,8 @@ github_docs_repo = "https://github.com/googleforgames/open-match-docs" # Google Custom Search Engine ID. Remove or comment out to disable search. gcs_engine_id = "008748710159674449076:sqoelpnrdoe" -release_branch = "master" -release_version = "1.2.0" +release_branch = "main" +release_version = "1.3.0" slack_link = "https://join.slack.com/t/open-match/shared_invite/enQtNDM1NjcxNTY4MTgzLTM5ZWQxNjc1YWI3MzJmN2RiMWJmYWI0ZjFiNzNkZmNkMWQ3YWU5OGVkNzA5Yzc4OGVkOGU5MTc0OTA5ZTA5NDU" # User interface configuration diff --git a/site/static/swaggerui/config.json b/site/static/swaggerui/config.json index 4a3e8d59..c13029f4 100644 --- a/site/static/swaggerui/config.json +++ b/site/static/swaggerui/config.json @@ -1,10 +1,10 @@ { "urls": [ - {"name": "Frontend", "url": "https://open-match.dev/api/v1.2.0/frontend.swagger.json"}, - {"name": "Backend", "url": "https://open-match.dev/api/v1.2.0/backend.swagger.json"}, - {"name": "Query", "url": "https://open-match.dev/api/v1.2.0/query.swagger.json"}, - {"name": "MatchFunction", "url": "https://open-match.dev/api/v1.2.0/matchfunction.swagger.json"}, - {"name": "Synchronizer", "url": "https://open-match.dev/api/v1.2.0/synchronizer.swagger.json"}, - {"name": "Evaluator", "url": "https://open-match.dev/api/v1.2.0/evaluator.swagger.json"} + {"name": "Frontend", "url": "https://open-match.dev/api/v1.3.0/frontend.swagger.json"}, + {"name": "Backend", "url": "https://open-match.dev/api/v1.3.0/backend.swagger.json"}, + {"name": "Query", "url": "https://open-match.dev/api/v1.3.0/query.swagger.json"}, + {"name": "MatchFunction", "url": "https://open-match.dev/api/v1.3.0/matchfunction.swagger.json"}, + {"name": "Synchronizer", "url": "https://open-match.dev/api/v1.3.0/synchronizer.swagger.json"}, + {"name": "Evaluator", "url": "https://open-match.dev/api/v1.3.0/evaluator.swagger.json"} ] } \ No newline at end of file