From 3e53b6d9c4161b1584fa2205faed67d8e761bee3 Mon Sep 17 00:00:00 2001 From: ImLucasBrown <54835354+ImLucasBrown@users.noreply.github.com> Date: Wed, 25 Nov 2020 21:52:49 -0500 Subject: [PATCH 01/10] * Updated how release loop works. --- build/release.nxt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build/release.nxt b/build/release.nxt index 4594031..3376765 100644 --- a/build/release.nxt +++ b/build/release.nxt @@ -601,9 +601,15 @@ "/ReleaseLoop": { "execute_in": "/GenerateChangelog", "comment": "Calls /CreateRelease", + "attrs": { + "release_types": { + "type": "tuple", + "value": "(${/versions.API}, ${/versions.GRAPH})" + } + }, "code": [ "# Parse return from versions sub-graph", - "for version_info in (${/versions.API}, ${/versions.GRAPH}):", + "for version_info in ${release_types}:", " # TODO: Don't make a release for graphs, just open a tab to create a tag", " if not version_info:", " continue", From bf1d0fe30619105fef790f56d7c9f5d20136e92c Mon Sep 17 00:00:00 2001 From: ImLucasBrown <54835354+ImLucasBrown@users.noreply.github.com> Date: Wed, 25 Nov 2020 21:53:06 -0500 Subject: [PATCH 02/10] version up for release --- nxt/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nxt/version.json b/nxt/version.json index fda0a18..f0e0924 100644 --- a/nxt/version.json +++ b/nxt/version.json @@ -2,7 +2,7 @@ "API": { "MAJOR": 0, "MINOR": 7, - "PATCH": 0 + "PATCH": 1 }, "GRAPH": { "MAJOR": 1, From 18782f4980d4d06f200b53c301a1c5ca802f7fa9 Mon Sep 17 00:00:00 2001 From: ImLucasBrown <54835354+ImLucasBrown@users.noreply.github.com> Date: Wed, 25 Nov 2020 22:01:13 -0500 Subject: [PATCH 03/10] Revert "version up for release" This reverts commit bf1d0fe3 --- nxt/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nxt/version.json b/nxt/version.json index f0e0924..fda0a18 100644 --- a/nxt/version.json +++ b/nxt/version.json @@ -2,7 +2,7 @@ "API": { "MAJOR": 0, "MINOR": 7, - "PATCH": 1 + "PATCH": 0 }, "GRAPH": { "MAJOR": 1, From d5c5a4337c7be9755c9853ac39923927a20c508e Mon Sep 17 00:00:00 2001 From: ImLucasBrown <54835354+ImLucasBrown@users.noreply.github.com> Date: Wed, 25 Nov 2020 22:01:22 -0500 Subject: [PATCH 04/10] Revert "* Updated how release loop works." This reverts commit 3e53b6d9 --- build/release.nxt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/build/release.nxt b/build/release.nxt index 3376765..4594031 100644 --- a/build/release.nxt +++ b/build/release.nxt @@ -601,15 +601,9 @@ "/ReleaseLoop": { "execute_in": "/GenerateChangelog", "comment": "Calls /CreateRelease", - "attrs": { - "release_types": { - "type": "tuple", - "value": "(${/versions.API}, ${/versions.GRAPH})" - } - }, "code": [ "# Parse return from versions sub-graph", - "for version_info in ${release_types}:", + "for version_info in (${/versions.API}, ${/versions.GRAPH}):", " # TODO: Don't make a release for graphs, just open a tab to create a tag", " if not version_info:", " continue", From 0c2954f884f60915b14e56de4774750b86e12bd2 Mon Sep 17 00:00:00 2001 From: ImLucasBrown <54835354+ImLucasBrown@users.noreply.github.com> Date: Wed, 25 Nov 2020 22:03:54 -0500 Subject: [PATCH 05/10] * Updated how release loop works. --- build/release.nxt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build/release.nxt b/build/release.nxt index 4594031..3376765 100644 --- a/build/release.nxt +++ b/build/release.nxt @@ -601,9 +601,15 @@ "/ReleaseLoop": { "execute_in": "/GenerateChangelog", "comment": "Calls /CreateRelease", + "attrs": { + "release_types": { + "type": "tuple", + "value": "(${/versions.API}, ${/versions.GRAPH})" + } + }, "code": [ "# Parse return from versions sub-graph", - "for version_info in (${/versions.API}, ${/versions.GRAPH}):", + "for version_info in ${release_types}:", " # TODO: Don't make a release for graphs, just open a tab to create a tag", " if not version_info:", " continue", From 6848e72057b80a9b31dd92e40b6d4780346e9b43 Mon Sep 17 00:00:00 2001 From: ImLucasBrown <54835354+ImLucasBrown@users.noreply.github.com> Date: Wed, 25 Nov 2020 22:04:13 -0500 Subject: [PATCH 06/10] version up for release --- nxt/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nxt/version.json b/nxt/version.json index fda0a18..f0e0924 100644 --- a/nxt/version.json +++ b/nxt/version.json @@ -2,7 +2,7 @@ "API": { "MAJOR": 0, "MINOR": 7, - "PATCH": 0 + "PATCH": 1 }, "GRAPH": { "MAJOR": 1, From 6aa194c77cba6b148a2f9848655c28f47fc50769 Mon Sep 17 00:00:00 2001 From: ImLucasBrown <54835354+ImLucasBrown@users.noreply.github.com> Date: Wed, 25 Nov 2020 22:11:53 -0500 Subject: [PATCH 07/10] Fixed wrong target branch for releases --- build/GitUtils.nxt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/GitUtils.nxt b/build/GitUtils.nxt index 888cd4a..c6e5e0e 100644 --- a/build/GitUtils.nxt +++ b/build/GitUtils.nxt @@ -265,7 +265,7 @@ "", "data = {", " \"tag_name\": \"${version_tag}\",", - " \"target_commitish\": \"master\",", + " \"target_commitish\": \"release\",", " \"name\": \"${version_name} v${version_str}\",", " \"body\": ${body},", " \"draft\": True,", @@ -288,6 +288,7 @@ " print('making new release')", " new_rel_resp = requests.post(url, auth=self.secret, data=json.dumps(data))", " if new_rel_resp.status_code != 201:", + " print(new_rel_resp)", " print('unsuccessful release')", " print(new_rel_resp.status_code)", " sys.exit()", From 7ba77c3d938f438289f70c74a24f2609526f76ec Mon Sep 17 00:00:00 2001 From: ImLucasBrown <54835354+ImLucasBrown@users.noreply.github.com> Date: Wed, 25 Nov 2020 22:23:01 -0500 Subject: [PATCH 08/10] Getting graph version for release footer --- build/release.nxt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/build/release.nxt b/build/release.nxt index 3376765..a3b33cf 100644 --- a/build/release.nxt +++ b/build/release.nxt @@ -365,7 +365,7 @@ "import shutil", "# Internal", "import nxt", - "from nxt.constants import API_VERSION", + "from nxt.constants import API_VERSION, GRAPH_VERSION", "" ] }, @@ -540,6 +540,10 @@ "type": "raw", "value": "${contents::${file::release_footer.md}}" }, + "graph_version": { + "type": "raw", + "value": "unknown" + }, "repo": { "value": "${/.repo}" } @@ -618,7 +622,8 @@ " version_name = version_cat.capitalize()", " parameters = {'/CreateRelease.version_tag': version_tag,", " '/CreateRelease.version_name': version_name,", - " '/CreateRelease.version_str': version_str}", + " '/CreateRelease.version_str': version_str,", + " '/CreateRelease.graph_version': GRAPH_VERSION}", " execute(start='/CreateRelease', parameters=parameters)" ] }, From 7a94fd7253a6858f6dd61847a92f75db86001706 Mon Sep 17 00:00:00 2001 From: ImLucasBrown <54835354+ImLucasBrown@users.noreply.github.com> Date: Wed, 25 Nov 2020 22:26:14 -0500 Subject: [PATCH 09/10] I put the attr on the wrong node --- build/release.nxt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build/release.nxt b/build/release.nxt index a3b33cf..acecf63 100644 --- a/build/release.nxt +++ b/build/release.nxt @@ -526,6 +526,12 @@ "OpenReleaseURL" ], "comment": "Create the draft release and open it in your browser.", + "attrs": { + "graph_version": { + "type": "raw", + "value": "unknown" + } + }, "code": [ "print(\"Beginning release...\")" ] @@ -540,10 +546,6 @@ "type": "raw", "value": "${contents::${file::release_footer.md}}" }, - "graph_version": { - "type": "raw", - "value": "unknown" - }, "repo": { "value": "${/.repo}" } From 56b99f457209f9adc4a8951435d837a5a5b794bd Mon Sep 17 00:00:00 2001 From: ImLucasBrown <54835354+ImLucasBrown@users.noreply.github.com> Date: Wed, 25 Nov 2020 22:28:54 -0500 Subject: [PATCH 10/10] Forgot to get the version string off the version object. --- build/release.nxt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/release.nxt b/build/release.nxt index acecf63..1370cf1 100644 --- a/build/release.nxt +++ b/build/release.nxt @@ -625,7 +625,7 @@ " parameters = {'/CreateRelease.version_tag': version_tag,", " '/CreateRelease.version_name': version_name,", " '/CreateRelease.version_str': version_str,", - " '/CreateRelease.graph_version': GRAPH_VERSION}", + " '/CreateRelease.graph_version': GRAPH_VERSION.VERSION_STR}", " execute(start='/CreateRelease', parameters=parameters)" ] },