diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 66dbe36..e212f9b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,14 +25,14 @@ jobs: ninja_sudo: sudo rust: stable tar: osx - - target: x86_64-pc-windows-msvc - os: windows-latest - ninja_file: ninja-win.zip - ninja_sha: bbde850d247d2737c5764c927d1071cbb1f1957dcabda4a130fa8547c12c695f - ninja_dir: /usr/bin - ninja_sudo: - rust: stable - tar: windows + # - target: x86_64-pc-windows-msvc + # os: windows-latest + # ninja_file: ninja-win.zip + # ninja_sha: bbde850d247d2737c5764c927d1071cbb1f1957dcabda4a130fa8547c12c695f + # ninja_dir: /usr/bin + # ninja_sudo: + # rust: stable + # tar: windows steps: - uses: actions/checkout@v1 - name: Install coreutils @@ -74,10 +74,10 @@ jobs: uses: actions/download-artifact@v2 with: name: solana-bpf-tools-osx.tar.bz2 - - name: Download Windows tarball - uses: actions/download-artifact@v2 - with: - name: solana-bpf-tools-windows.tar.bz2 + # - name: Download Windows tarball + # uses: actions/download-artifact@v2 + # with: + # name: solana-bpf-tools-windows.tar.bz2 - name: Create Release id: create_release uses: actions/create-release@v1 @@ -108,13 +108,13 @@ jobs: asset_path: solana-bpf-tools-osx.tar.bz2 asset_name: solana-bpf-tools-osx.tar.bz2 asset_content_type: application/zip - - name: Release Windows tarball - id: upload-release-windows - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: solana-bpf-tools-windows.tar.bz2 - asset_name: solana-bpf-tools-windows.tar.bz2 - asset_content_type: application/zip + # - name: Release Windows tarball + # id: upload-release-windows + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # upload_url: ${{ steps.create_release.outputs.upload_url }} + # asset_path: solana-bpf-tools-windows.tar.bz2 + # asset_name: solana-bpf-tools-windows.tar.bz2 + # asset_content_type: application/zip diff --git a/build.sh b/build.sh index abc0581..603fd55 100755 --- a/build.sh +++ b/build.sh @@ -23,10 +23,10 @@ rm -rf out mkdir -p out pushd out -git clone --single-branch --branch bpf-tools-v1.18 https://github.com/solana-labs/rust.git +git clone --single-branch --branch bpf-tools-v1.19 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 rust-1.54.0 https://github.com/rust-lang/cargo.git +git clone --single-branch --branch rust-1.56.0 https://github.com/rust-lang/cargo.git echo "$( cd cargo && git rev-parse HEAD ) https://github.com/rust-lang/cargo.git" >> version.md pushd rust @@ -38,7 +38,7 @@ OPENSSL_STATIC=1 cargo build --release popd if [[ "${HOST_TRIPLE}" != "x86_64-pc-windows-msvc" ]] ; then - git clone --single-branch --branch bpf-tools-v1.18 https://github.com/solana-labs/newlib.git + git clone --single-branch --branch bpf-tools-v1.19 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 @@ -74,7 +74,7 @@ clang clang++ clang-cl clang-cpp -clang-12 +clang-13 ld.lld ld64.lld llc