From 46d1d0dd70987915d09189d026c3086c3050e1b1 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 31 Jan 2023 07:21:41 -0800
Subject: [PATCH] Pin release artifacts Rust toolchain

This fixes the build issue identified in #5664 at the toolchain level
rather than working around it in our own build. The next step in fixing
this will be to remove the nightly override in the future when the
toolchain becomes stable.
---
 .github/workflows/build.yml |  6 ++++++
 ci/build-tarballs.sh        | 10 ----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 48a300e78eb2..6ea2885e8f57 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,6 +56,12 @@ jobs:
       with:
         submodules: true
     - uses: ./.github/actions/install-rust
+      # Note that the usage of this nightly toolchain is temporary until it
+      # rides to stable. After this nightly version becomes stable (Rust 1.69.0)
+      # then this should switch back to using stable by deleting the `with` and
+      # `toolchain` options.
+      with:
+        toolchain: nightly-2023-01-31
     # On one builder produce the source tarball since there's no need to produce
     # it everywhere
     - run: ./ci/build-src-tarball.sh
diff --git a/ci/build-tarballs.sh b/ci/build-tarballs.sh
index 07030bcfdf44..491a6d94afcb 100755
--- a/ci/build-tarballs.sh
+++ b/ci/build-tarballs.sh
@@ -49,8 +49,6 @@ if [ "$platform" = "x86_64-windows" ]; then
   "$WIX/bin/light" -out dist/$bin_pkgname.msi target/wasmtime.wixobj -ext WixUtilExtension
   rm dist/$bin_pkgname.wixpdb
 elif [ "$platform" = "x86_64-mingw" ]; then
-  # FIXME: remove when https://github.com/rust-lang/rust/issues/107495 is fixed
-  chmod 0664 target/x86_64-pc-windows-gnu/release/libwasmtime.a
   cp target/x86_64-pc-windows-gnu/release/wasmtime.exe tmp/$bin_pkgname
   cp target/x86_64-pc-windows-gnu/release/{wasmtime.dll,libwasmtime.a,libwasmtime.dll.a} tmp/$api_pkgname/lib
   fmt=zip
@@ -59,24 +57,16 @@ elif [ "$platform" = "x86_64-macos" ]; then
   # directive than the default one that comes out of the linker when typically
   # doing `cargo build`. For more info see #984
   install_name_tool -id "@rpath/libwasmtime.dylib" target/release/libwasmtime.dylib
-  # FIXME: remove when https://github.com/rust-lang/rust/issues/107495 is fixed
-  sudo chmod 0664 target/release/libwasmtime.a
   cp target/release/wasmtime tmp/$bin_pkgname
   cp target/release/libwasmtime.{a,dylib} tmp/$api_pkgname/lib
 elif [ "$platform" = "aarch64-macos" ]; then
   install_name_tool -id "@rpath/libwasmtime.dylib" target/aarch64-apple-darwin/release/libwasmtime.dylib
-  # FIXME: remove when https://github.com/rust-lang/rust/issues/107495 is fixed
-  sudo chmod 0664 target/aarch64-apple-darwin/release/libwasmtime.a
   cp target/aarch64-apple-darwin/release/wasmtime tmp/$bin_pkgname
   cp target/aarch64-apple-darwin/release/libwasmtime.{a,dylib} tmp/$api_pkgname/lib
 elif [ "$target" = "" ]; then
-  # FIXME: remove when https://github.com/rust-lang/rust/issues/107495 is fixed
-  sudo chmod 0664 target/release/libwasmtime.a
   cp target/release/wasmtime tmp/$bin_pkgname
   cp target/release/libwasmtime.{a,so} tmp/$api_pkgname/lib
 else
-  # FIXME: remove when https://github.com/rust-lang/rust/issues/107495 is fixed
-  sudo chmod 0664 target/$target/release/libwasmtime.a
   cp target/$target/release/wasmtime tmp/$bin_pkgname
   cp target/$target/release/libwasmtime.{a,so} tmp/$api_pkgname/lib
 fi