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()", diff --git a/build/release.nxt b/build/release.nxt index 4594031..1370cf1 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", "" ] }, @@ -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...\")" ] @@ -601,9 +607,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", @@ -612,7 +624,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.VERSION_STR}", " execute(start='/CreateRelease', parameters=parameters)" ] }, 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,