Merge #3342

3342: Fixes for 3.0.0 release r=fschutt a=fschutt Co-authored-by: Felix Schütt <[email protected]> Co-authored-by: Felix Schütt <[email protected]>
wasmerio · Nov 22, 2022 · 4a903f8 · 4a903f8
2 parents 0928629 + 8d73aad
commit 4a903f8
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 43 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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)
@@ -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
 

diff --git 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 {