From f07514df2b89256c55267c1c979c9a2826057d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Sch=C3=BCtt?= Date: Mon, 21 Nov 2022 11:07:38 +0100 Subject: [PATCH 1/3] Fixes for make-release.py script --- scripts/make-release.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/make-release.py b/scripts/make-release.py index 95f2b338398..ea4969a2e89 100644 --- a/scripts/make-release.py +++ b/scripts/make-release.py @@ -126,7 +126,7 @@ def make_release(version): already_released_str = "" for line in proc.stdout: line = line.decode("utf-8").rstrip() - if RELEASE_VERSION in line: + if RELEASE_VERSION + "\t" in line: already_released_str = line break @@ -138,10 +138,12 @@ def make_release(version): github_link_line = "" for line in proc.stdout: line = line.decode("utf-8").rstrip() - if RELEASE_VERSION in line: + if "release-" + RELEASE_VERSION + "\t" in line: github_link_line = line break + print("github link line" + github_link_line) + if github_link_line != "": proc = subprocess.Popen(['git','pull', "origin", "release-" + RELEASE_VERSION], stdout = subprocess.PIPE, cwd = temp_dir.name) proc.wait() @@ -213,7 +215,7 @@ def make_release(version): for line in proc.stdout: line = line.decode("utf-8").rstrip() - if RELEASE_VERSION in line: + if "release-" + RELEASE_VERSION + "\t" in line: github_link_line = line break @@ -342,7 +344,7 @@ def make_release(version): github_link_line = "" for line in proc.stdout: line = line.decode("utf-8").rstrip() - if RELEASE_VERSION in line: + if RELEASE_VERSION + "\t" in line: github_link_line = line break From 021875e4673246d91006541f6e454da1b44da3c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Sch=C3=BCtt?= Date: Mon, 21 Nov 2022 19:03:38 +0100 Subject: [PATCH 2/3] Re-enable test for x86_64-windows-gnu --- tests/integration/cli/tests/run.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/integration/cli/tests/run.rs b/tests/integration/cli/tests/run.rs index e1a5afefb4f..55e391fdfc2 100644 --- a/tests/integration/cli/tests/run.rs +++ b/tests/integration/cli/tests/run.rs @@ -31,13 +31,7 @@ fn test_cross_compile_python_windows() -> anyhow::Result<()> { "x86_64-darwin", "x86_64-linux-gnu", "aarch64-linux-gnu", - // TODO: this test depends on the latest release -gnu64.tar.gz - // to be present, but we can't release the next release before - // the integration tests are passing, so this test depends on itself - // - // We need to first release a version without -windows being tested - // then do a second PR to test that Windows works. - // "x86_64-windows-gnu", + "x86_64-windows-gnu", ]; for t in targets { From 6d753e90e693cf453114cf01cf18e8a01d459f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Sch=C3=BCtt?= Date: Mon, 21 Nov 2022 19:05:21 +0100 Subject: [PATCH 3/3] Fix typo in CHANGELOG and release notes generation --- scripts/make-release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/make-release.py b/scripts/make-release.py index ea4969a2e89..c246b91a52f 100644 --- a/scripts/make-release.py +++ b/scripts/make-release.py @@ -85,7 +85,7 @@ def make_release(version): fields = l.split("\t") pr_number = fields[1] pr_text = fields[3] - l = " - (#" + pr_number + ")[https://github.com/wasmerio/wasmer/" + pr_number + "] " + pr_text + l = " - [#" + pr_number + "](https://github.com/wasmerio/wasmer/pull/" + pr_number + ") " + pr_text release_notes_changed.append(l) if "add" in l.lower(): added.append(l)