diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4b5b746..97025b2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,7 +51,6 @@ jobs: - name: Install coreutils run: | brew update && brew install coreutils - brew rm swig && brew install swig@3 && brew link swig@3 if: matrix.os == 'macos-latest' shell: bash - name: Install Ninja diff --git a/build.sh b/build.sh index 92d862b..193db7c 100755 --- a/build.sh +++ b/build.sh @@ -34,10 +34,10 @@ rm -rf "${OUT_DIR}" mkdir -p "${OUT_DIR}" pushd "${OUT_DIR}" -git clone --single-branch --branch solana-tools-v1.37 https://github.com/solana-labs/rust.git +git clone --single-branch --branch solana-tools-v1.38 https://github.com/solana-labs/rust.git echo "$( cd rust && git rev-parse HEAD ) https://github.com/solana-labs/rust.git" >> version.md -git clone --single-branch --branch solana-tools-v1.37 https://github.com/solana-labs/cargo.git +git clone --single-branch --branch solana-tools-v1.38 https://github.com/solana-labs/cargo.git echo "$( cd cargo && git rev-parse HEAD ) https://github.com/solana-labs/cargo.git" >> version.md pushd rust @@ -57,7 +57,7 @@ fi popd if [[ "${HOST_TRIPLE}" != "x86_64-pc-windows-msvc" ]] ; then - git clone --single-branch --branch solana-tools-v1.37 https://github.com/solana-labs/newlib.git + git clone --single-branch --branch solana-tools-v1.38 https://github.com/solana-labs/newlib.git echo "$( cd newlib && git rev-parse HEAD ) https://github.com/solana-labs/newlib.git" >> version.md mkdir -p newlib_build mkdir -p newlib_install @@ -159,6 +159,7 @@ tar -C deploy -jcf ${ARTIFACT} . MOVE_DEV_TAR=${ARTIFACT/platform-tools/move-dev} mkdir move-dev if [[ "${HOST_TRIPLE}" == "x86_64-pc-windows-msvc" ]] ; then + rm -rf deploy rm -f rust/build/${HOST_TRIPLE}/llvm/bin/{llvm-ranlib.exe,llvm-lib.exe,llvm-dlltool.exe} fi cp -R "rust/build/${HOST_TRIPLE}/llvm/"{bin,include,lib} move-dev/