From 4d6c96c41827662702bf4052cc01d968d44ff7f1 Mon Sep 17 00:00:00 2001 From: Juraj Michalek Date: Thu, 21 Oct 2021 08:09:01 +0200 Subject: [PATCH] build: prepare 1.56.0 release --- ...ld-rust-aarch64-apple-darwin-dispatch.yaml | 8 +- .github/workflows/build-rust-dispatch.yaml | 36 ++++---- .github/workflows/build-rust-on-tag.yaml | 86 +------------------ ...ild-rust-x86_64-apple-darwin-dispatch.yaml | 40 +-------- ...-rust-x86_64-pc-windows-msvc-dispatch.yaml | 57 ++---------- ...ust-x86_64-unknown-linux-gnu-dispatch.yaml | 40 +-------- ...st-rust-aarch64-apple-darwin-dispatch.yaml | 41 +-------- ...est-rust-x86_64-apple-darwin-dispatch.yaml | 45 +--------- ...-rust-x86_64-pc-windows-msvc-dispatch.yaml | 39 +-------- ...-pc-windows-msvc-self-hosted-dispatch.yaml | 39 +-------- ...ust-x86_64-unknown-linux-gnu-dispatch.yaml | 41 +-------- Dockerfile | 2 +- Install-RustToolchain.ps1 | 4 +- install-rust-toolchain.sh | 4 +- 14 files changed, 52 insertions(+), 430 deletions(-) diff --git a/.github/workflows/build-rust-aarch64-apple-darwin-dispatch.yaml b/.github/workflows/build-rust-aarch64-apple-darwin-dispatch.yaml index 46c375f3..d030c65f 100644 --- a/.github/workflows/build-rust-aarch64-apple-darwin-dispatch.yaml +++ b/.github/workflows/build-rust-aarch64-apple-darwin-dispatch.yaml @@ -40,8 +40,8 @@ jobs: - os: macos-m1-self-hosted ARCH: '' TARGET: win-x64 - ASSET_PATH: 'build/dist/rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' - ASSET_NAME: 'rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' + ASSET_PATH: 'build/dist/rust-1.56.0-dev-aarch64-apple-darwin.tar.xz' + ASSET_NAME: 'rust-1.56.0-dev-aarch64-apple-darwin.tar.xz' ASSET_CONTENT_TYPE: 'application/x-tar' LLVM_ROOT_OPTION: '' steps: @@ -49,7 +49,7 @@ jobs: uses: actions/checkout@v2 with: repository: esp-rs/rust - ref: esp-1.55.0 + ref: esp-1.56.0 submodules: true - name: Set up Python if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-18.04' || matrix.os == 'windows-latest' }} @@ -78,7 +78,5 @@ jobs: upload_url: ${{ needs.get_release.outputs.upload_url }} asset_path: ${{ matrix.ASSET_PATH }} asset_name: ${{ matrix.ASSET_NAME }} - # asset_path: build/dist/rust-1.55.0-dev-aarch64-apple-darwin.tar.xz - # asset_name: rust-1.55.0-dev-aarch64-apple-darwin.tar.xz asset_content_type: ${{ matrix.ASSET_CONTENT_TYPE }} diff --git a/.github/workflows/build-rust-dispatch.yaml b/.github/workflows/build-rust-dispatch.yaml index b7b0552e..d3b7a1a0 100644 --- a/.github/workflows/build-rust-dispatch.yaml +++ b/.github/workflows/build-rust-dispatch.yaml @@ -53,36 +53,36 @@ jobs: # - os: macos-latest # ARCH: '' # TARGET: macos-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-x86_64-apple-darwin.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-x86_64-apple-darwin.tar.xz' + # ASSET_PATH: 'build/dist/rust-1.56.0-dev-x86_64-apple-darwin.tar.xz' + # ASSET_NAME: 'rust-1.56.0-dev-x86_64-x86_64-apple-darwin.tar.xz' # ASSET_CONTENT_TYPE: 'application/x-tar' # LLVM_ROOT_OPTION: '' # - os: ubuntu-18.04 # ARCH: '' # TARGET: linux-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' + # ASSET_PATH: 'build/dist/rust-1.56.0-dev-x86_64-unknown-linux-gnu.tar.xz' + # ASSET_NAME: 'rust-1.56.0-dev-x86_64-unknown-linux-gnu.tar.xz' # ASSET_CONTENT_TYPE: 'application/x-tar' # LLVM_ROOT_OPTION: '' - os: windows-latest ARCH: '' TARGET: win-x64 ASSET_PATH: 'build/dist/esp.zip' - ASSET_NAME: 'rust-1.55.0-dev-x86_64-pc-windows-msvc.zip' + ASSET_NAME: 'rust-1.56.0-dev-x86_64-pc-windows-msvc.zip' ASSET_CONTENT_TYPE: 'application/zip' LLVM_ROOT_OPTION: '' # - os: windows-self-hosted # ARCH: '' # TARGET: win-x64 # ASSET_PATH: 'build/dist/esp.zip' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-pc-windows-msvc.zip' + # ASSET_NAME: 'rust-1.56.0-dev-x86_64-pc-windows-msvc.zip' # ASSET_CONTENT_TYPE: 'application/zip' # LLVM_ROOT_OPTION: '--llvm-root=C:/llvm-project' # - os: macos-m1-self-hosted # ARCH: '' # TARGET: win-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' + # ASSET_PATH: 'build/dist/rust-1.56.0-dev-aarch64-apple-darwin.tar.xz' + # ASSET_NAME: 'rust-1.56.0-dev-aarch64-apple-darwin.tar.xz' # ASSET_CONTENT_TYPE: 'application/x-tar' # LLVM_ROOT_OPTION: '' steps: @@ -90,7 +90,7 @@ jobs: uses: actions/checkout@v2 with: repository: esp-rs/rust - ref: esp-1.55.0 + ref: esp-1.56.0 submodules: true - name: Set up Python if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-18.04' || matrix.os == 'windows-latest' }} @@ -121,7 +121,7 @@ jobs: run: python3 x.py dist --stage 2 --exclude src/doc --llvm-skip-rebuild TRUE - name: Dist bundle for Windows # Windows build has several issues: - # - long path problem in version 1.55.0, build of some dist artifacts fails + # - long path problem in version 1.56.0, build of some dist artifacts fails # - cp -r from stage2 is dangerous, because there is a src symlink to parent project dir which causes recursion # Following code is workaround which assembles minimal distribution of toolchain which should be extracted to ~/.rustup/toolchains. if: ${{ matrix.os == 'windows-self-hosted' || matrix.os == 'windows-latest' }} @@ -129,17 +129,17 @@ jobs: run: | cd build/dist mkdir esp - 7z e rust-1.55.0-dev-x86_64-pc-windows-msvc.tar.xz - 7z x rust-1.55.0-dev-x86_64-pc-windows-msvc.tar - pushd rust-1.55.0-dev-x86_64-pc-windows-msvc + 7z e rust-1.56.0-dev-x86_64-pc-windows-msvc.tar.xz + 7z x rust-1.56.0-dev-x86_64-pc-windows-msvc.tar + pushd rust-1.56.0-dev-x86_64-pc-windows-msvc cp -Recurse .\rustc\bin ..\esp\ cp -Recurse .\rustc\lib ..\esp\ cp -Recurse .\rustc\share ..\esp\ cp -ErrorAction SilentlyContinue -Recurse .\rust-std-x86_64-pc-windows-msvc\lib\* ..\esp\lib\ popd - 7z e rust-src-1.55.0-dev.tar.xz - 7z x rust-src-1.55.0-dev.tar - pushd rust-src-1.55.0-dev + 7z e rust-src-1.56.0-dev.tar.xz + 7z x rust-src-1.56.0-dev.tar + pushd rust-src-1.56.0-dev cp -ErrorAction SilentlyContinue -Recurse .\rust-src\lib\* ..\esp\lib\ popd 7z a esp.zip esp/ @@ -152,7 +152,7 @@ jobs: upload_url: ${{ needs.get_release.outputs.upload_url }} asset_path: ${{ matrix.ASSET_PATH }} asset_name: ${{ matrix.ASSET_NAME }} - # asset_path: build/dist/rust-1.55.0-dev-aarch64-apple-darwin.tar.xz - # asset_name: rust-1.55.0-dev-aarch64-apple-darwin.tar.xz + # asset_path: build/dist/rust-1.56.0-dev-aarch64-apple-darwin.tar.xz + # asset_name: rust-1.56.0-dev-aarch64-apple-darwin.tar.xz asset_content_type: ${{ matrix.ASSET_CONTENT_TYPE }} diff --git a/.github/workflows/build-rust-on-tag.yaml b/.github/workflows/build-rust-on-tag.yaml index 04260aed..770cd859 100644 --- a/.github/workflows/build-rust-on-tag.yaml +++ b/.github/workflows/build-rust-on-tag.yaml @@ -1,4 +1,4 @@ -name: build-rust-on-tag +name: create-rust-release on: push: @@ -22,87 +22,3 @@ jobs: release_name: Release ${{ github.ref }} draft: false prerelease: false - - build-idf-rust: - name: Build Rust for ${{ matrix.os }} - needs: create_release - runs-on: ${{ matrix.os }} - strategy: - matrix: - #os: [macos-latest, self-hosted-macos-arm64, ubuntu-latest, windows-latest] - #os: [macos-latest, ubuntu-18.04 ] - #os: [macos-latest, ubuntu-18.04, windows-latest] - #os: [ubuntu-18.04] - #os: [windows-latest] - os: [macos-latest] - # os: [ [self-hosted, Windows, X64] ] - # os: [ [self-hosted, macOS, M1] ] - include: - - os: macos-latest - ARCH: '' - TARGET: macos-x64 - ASSET_PATH: 'build/dist/rust-1.55.0-dev-x86_64-apple-darwin.tar.xz' - ASSET_NAME: 'rust-1.55.0-dev-x86_64-x86_64-apple-darwin.tar.xz' - ASSET_CONTENT_TYPE: 'application/x-tar' - #- os: ubuntu-18.04 - # ARCH: '' - # TARGET: linux-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' - # ASSET_CONTENT_TYPE: 'application/x-tar' - #- os: windows-latest - # ARCH: '' - # TARGET: win-x64 - # ASSET_PATH: 'build/dist/esp.zip' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-pc-windows-msvc.zip' - # ASSET_CONTENT_TYPE: 'application/zip' - steps: - - name: Checkout repository - uses: actions/checkout@v2 - with: - repository: esp-rs/rust - ref: esp-1.55.0 - - name: Set up Python - if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-18.04' || matrix.os == 'windows-latest' }} - uses: actions/setup-python@v2 - with: - python-version: '3.8' - - name: Setup Ninja - if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-18.04' || matrix.os == 'windows-latest' }} - uses: seanmiddleditch/gha-setup-ninja@master - - name: Prepare build - run: python3 src/bootstrap/configure.py --experimental-targets=Xtensa --enable-extended --tools=rustfmt --dist-compression-formats='xz' - - name: Build with x.py - only components - if: ${{ matrix.os == 'windows-latest' }} - run: | - python3 x.py build compiler/rustc src/tools/rustfmt library/std --stage 2 - python3 x.py dist src --stage 2 - - name: Build with x.py - dist packages - if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-18.04' }} - run: python3 x.py dist --stage 2 - # Excluding src/doc breaks build of 1.55 - #run: python3 x.py dist --stage 2 --exclude src/doc - - name: Dist bundle for Windows - if: ${{ matrix.os == 'windows-latest' }} - shell: bash - run: | - mkdir -p build/dist/esp - cp -r build/x86_64-pc-windows-msvc/stage2/* build/dist/esp - tar xf ../rust-src-1.55.0-dev.tar.xz - cp -r rust-src-1.55.0-dev/* build/dist/esp - cd build/dist - find . -name '*.pdb' -delete - zip -r esp.zip esp - - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.create_release.outputs.upload_url }} - asset_path: ${{ matrix.ASSET_PATH }} - asset_name: ${{ matrix.ASSET_NAME }} - # asset_path: build/dist/rust-1.55.0-dev-aarch64-apple-darwin.tar.xz - # asset_name: rust-1.55.0-dev-aarch64-apple-darwin.tar.xz - asset_content_type: ${{ matrix.ASSET_CONTENT_TYPE }} - diff --git a/.github/workflows/build-rust-x86_64-apple-darwin-dispatch.yaml b/.github/workflows/build-rust-x86_64-apple-darwin-dispatch.yaml index f764654b..acdce4e7 100644 --- a/.github/workflows/build-rust-x86_64-apple-darwin-dispatch.yaml +++ b/.github/workflows/build-rust-x86_64-apple-darwin-dispatch.yaml @@ -34,21 +34,13 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - #os: [macos-latest, self-hosted-macos-arm64, ubuntu-latest, windows-latest] - #os: [macos-latest, ubuntu-18.04 ] - #os: [macos-latest, ubuntu-18.04, windows-latest] - #os: [ubuntu-18.04] os: [macos-latest] - # os: [ [self-hosted, Windows, X64] ] - # os: [ [self-hosted, macOS, M1] ] - #os: [ windows-self-hosted, macos-m1-self-hosted ] - # os: [ windows-self-hosted ] include: - os: macos-latest ARCH: '' TARGET: macos-x64 - ASSET_PATH: 'build/dist/rust-1.55.0-dev-x86_64-apple-darwin.tar.xz' - ASSET_NAME: 'rust-1.55.0-dev-x86_64-x86_64-apple-darwin.tar.xz' + ASSET_PATH: 'build/dist/rust-1.56.0-dev-x86_64-apple-darwin.tar.xz' + ASSET_NAME: 'rust-1.56.0-dev-x86_64-x86_64-apple-darwin.tar.xz' ASSET_CONTENT_TYPE: 'application/x-tar' LLVM_ROOT_OPTION: '' steps: @@ -56,7 +48,7 @@ jobs: uses: actions/checkout@v2 with: repository: esp-rs/rust - ref: esp-1.55.0 + ref: esp-1.56.0 submodules: true - name: Set up Python if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-18.04' || matrix.os == 'windows-latest' }} @@ -85,30 +77,6 @@ jobs: - name: Build with x.py - dist packages - with cached LLVM if: ${{ matrix.os == 'macos-m1-self-hosted' }} run: python3 x.py dist --stage 2 --exclude src/doc --llvm-skip-rebuild TRUE - - name: Dist bundle for Windows - # Windows build has several issues: - # - long path problem in version 1.55.0, build of some dist artifacts fails - # - cp -r from stage2 is dangerous, because there is a src symlink to parent project dir which causes recursion - # Following code is workaround which assembles minimal distribution of toolchain which should be extracted to ~/.rustup/toolchains. - if: ${{ matrix.os == 'windows-self-hosted' || matrix.os == 'windows-latest' }} - shell: pwsh - run: | - cd build/dist - mkdir esp - 7z e rust-1.55.0-dev-x86_64-pc-windows-msvc.tar.xz - 7z x rust-1.55.0-dev-x86_64-pc-windows-msvc.tar - pushd rust-1.55.0-dev-x86_64-pc-windows-msvc - cp -Recurse .\rustc\bin ..\esp\ - cp -Recurse .\rustc\lib ..\esp\ - cp -Recurse .\rustc\share ..\esp\ - cp -ErrorAction SilentlyContinue -Recurse .\rust-std-x86_64-pc-windows-msvc\lib\* ..\esp\lib\ - popd - 7z e rust-src-1.55.0-dev.tar.xz - 7z x rust-src-1.55.0-dev.tar - pushd rust-src-1.55.0-dev - cp -ErrorAction SilentlyContinue -Recurse .\rust-src\lib\* ..\esp\lib\ - popd - 7z a esp.zip esp/ - name: Upload Release Asset id: upload-release-asset uses: actions/upload-release-asset@v1 @@ -118,7 +86,5 @@ jobs: upload_url: ${{ needs.get_release.outputs.upload_url }} asset_path: ${{ matrix.ASSET_PATH }} asset_name: ${{ matrix.ASSET_NAME }} - # asset_path: build/dist/rust-1.55.0-dev-aarch64-apple-darwin.tar.xz - # asset_name: rust-1.55.0-dev-aarch64-apple-darwin.tar.xz asset_content_type: ${{ matrix.ASSET_CONTENT_TYPE }} diff --git a/.github/workflows/build-rust-x86_64-pc-windows-msvc-dispatch.yaml b/.github/workflows/build-rust-x86_64-pc-windows-msvc-dispatch.yaml index 82bcc9ff..6311872b 100644 --- a/.github/workflows/build-rust-x86_64-pc-windows-msvc-dispatch.yaml +++ b/.github/workflows/build-rust-x86_64-pc-windows-msvc-dispatch.yaml @@ -34,58 +34,21 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - #os: [macos-latest, self-hosted-macos-arm64, ubuntu-latest, windows-latest] - #os: [macos-latest, ubuntu-18.04 ] - #os: [macos-latest, ubuntu-18.04, windows-latest] - #os: [ubuntu-18.04] os: [windows-latest] - # os: [macos-latest] - # os: [ [self-hosted, Windows, X64] ] - # os: [ [self-hosted, macOS, M1] ] - #os: [ windows-self-hosted, macos-m1-self-hosted ] - # os: [ windows-self-hosted ] include: - # - os: macos-latest - # ARCH: '' - # TARGET: macos-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-x86_64-apple-darwin.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-x86_64-apple-darwin.tar.xz' - # ASSET_CONTENT_TYPE: 'application/x-tar' - # LLVM_ROOT_OPTION: '' - # - os: ubuntu-18.04 - # ARCH: '' - # TARGET: linux-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' - # ASSET_CONTENT_TYPE: 'application/x-tar' - # LLVM_ROOT_OPTION: '' - os: windows-latest ARCH: '' TARGET: win-x64 ASSET_PATH: 'build/dist/esp.zip' - ASSET_NAME: 'rust-1.55.0-dev-x86_64-pc-windows-msvc.zip' + ASSET_NAME: 'rust-1.56.0-dev-x86_64-pc-windows-msvc.zip' ASSET_CONTENT_TYPE: 'application/zip' LLVM_ROOT_OPTION: '' - # - os: windows-self-hosted - # ARCH: '' - # TARGET: win-x64 - # ASSET_PATH: 'build/dist/esp.zip' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-pc-windows-msvc.zip' - # ASSET_CONTENT_TYPE: 'application/zip' - # LLVM_ROOT_OPTION: '--llvm-root=C:/llvm-project' - # - os: macos-m1-self-hosted - # ARCH: '' - # TARGET: win-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' - # ASSET_CONTENT_TYPE: 'application/x-tar' - # LLVM_ROOT_OPTION: '' steps: - name: Checkout repository uses: actions/checkout@v2 with: repository: esp-rs/rust - ref: esp-1.55.0 + ref: esp-1.56.0 submodules: true - name: Set up Python if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-18.04' || matrix.os == 'windows-latest' }} @@ -111,7 +74,7 @@ jobs: run: python3 x.py dist --stage 2 --exclude src/doc --llvm-skip-rebuild TRUE - name: Dist bundle for Windows # Windows build has several issues: - # - long path problem in version 1.55.0, build of some dist artifacts fails + # - long path problem in version 1.56.0, build of some dist artifacts fails # - cp -r from stage2 is dangerous, because there is a src symlink to parent project dir which causes recursion # Following code is workaround which assembles minimal distribution of toolchain which should be extracted to ~/.rustup/toolchains. if: ${{ matrix.os == 'windows-self-hosted' || matrix.os == 'windows-latest' }} @@ -119,17 +82,17 @@ jobs: run: | cd build/dist mkdir esp - 7z e rust-1.55.0-dev-x86_64-pc-windows-msvc.tar.xz - 7z x rust-1.55.0-dev-x86_64-pc-windows-msvc.tar - pushd rust-1.55.0-dev-x86_64-pc-windows-msvc + 7z e rust-1.56.0-dev-x86_64-pc-windows-msvc.tar.xz + 7z x rust-1.56.0-dev-x86_64-pc-windows-msvc.tar + pushd rust-1.56.0-dev-x86_64-pc-windows-msvc cp -Recurse .\rustc\bin ..\esp\ cp -Recurse .\rustc\lib ..\esp\ cp -Recurse .\rustc\share ..\esp\ cp -ErrorAction SilentlyContinue -Recurse .\rust-std-x86_64-pc-windows-msvc\lib\* ..\esp\lib\ popd - 7z e rust-src-1.55.0-dev.tar.xz - 7z x rust-src-1.55.0-dev.tar - pushd rust-src-1.55.0-dev + 7z e rust-src-1.56.0-dev.tar.xz + 7z x rust-src-1.56.0-dev.tar + pushd rust-src-1.56.0-dev cp -ErrorAction SilentlyContinue -Recurse .\rust-src\lib\* ..\esp\lib\ popd 7z a esp.zip esp/ @@ -142,7 +105,5 @@ jobs: upload_url: ${{ needs.get_release.outputs.upload_url }} asset_path: ${{ matrix.ASSET_PATH }} asset_name: ${{ matrix.ASSET_NAME }} - # asset_path: build/dist/rust-1.55.0-dev-aarch64-apple-darwin.tar.xz - # asset_name: rust-1.55.0-dev-aarch64-apple-darwin.tar.xz asset_content_type: ${{ matrix.ASSET_CONTENT_TYPE }} diff --git a/.github/workflows/build-rust-x86_64-unknown-linux-gnu-dispatch.yaml b/.github/workflows/build-rust-x86_64-unknown-linux-gnu-dispatch.yaml index 2fe2c4f0..a1979047 100644 --- a/.github/workflows/build-rust-x86_64-unknown-linux-gnu-dispatch.yaml +++ b/.github/workflows/build-rust-x86_64-unknown-linux-gnu-dispatch.yaml @@ -34,21 +34,13 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - #os: [macos-latest, self-hosted-macos-arm64, ubuntu-latest, windows-latest] - #os: [macos-latest, ubuntu-18.04 ] - #os: [macos-latest, ubuntu-18.04, windows-latest] os: [ubuntu-18.04] - # os: [macos-latest] - # os: [ [self-hosted, Windows, X64] ] - # os: [ [self-hosted, macOS, M1] ] - #os: [ windows-self-hosted, macos-m1-self-hosted ] - # os: [ windows-self-hosted ] include: - os: ubuntu-18.04 ARCH: '' TARGET: linux-x64 - ASSET_PATH: 'build/dist/rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' - ASSET_NAME: 'rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' + ASSET_PATH: 'build/dist/rust-1.56.0-dev-x86_64-unknown-linux-gnu.tar.xz' + ASSET_NAME: 'rust-1.56.0-dev-x86_64-unknown-linux-gnu.tar.xz' ASSET_CONTENT_TYPE: 'application/x-tar' LLVM_ROOT_OPTION: '' steps: @@ -56,7 +48,7 @@ jobs: uses: actions/checkout@v2 with: repository: esp-rs/rust - ref: esp-1.55.0 + ref: esp-1.56.0 submodules: true - name: Set up Python if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-18.04' || matrix.os == 'windows-latest' }} @@ -85,30 +77,6 @@ jobs: - name: Build with x.py - dist packages - with cached LLVM if: ${{ matrix.os == 'macos-m1-self-hosted' }} run: python3 x.py dist --stage 2 --exclude src/doc --llvm-skip-rebuild TRUE - - name: Dist bundle for Windows - # Windows build has several issues: - # - long path problem in version 1.55.0, build of some dist artifacts fails - # - cp -r from stage2 is dangerous, because there is a src symlink to parent project dir which causes recursion - # Following code is workaround which assembles minimal distribution of toolchain which should be extracted to ~/.rustup/toolchains. - if: ${{ matrix.os == 'windows-self-hosted' || matrix.os == 'windows-latest' }} - shell: pwsh - run: | - cd build/dist - mkdir esp - 7z e rust-1.55.0-dev-x86_64-pc-windows-msvc.tar.xz - 7z x rust-1.55.0-dev-x86_64-pc-windows-msvc.tar - pushd rust-1.55.0-dev-x86_64-pc-windows-msvc - cp -Recurse .\rustc\bin ..\esp\ - cp -Recurse .\rustc\lib ..\esp\ - cp -Recurse .\rustc\share ..\esp\ - cp -ErrorAction SilentlyContinue -Recurse .\rust-std-x86_64-pc-windows-msvc\lib\* ..\esp\lib\ - popd - 7z e rust-src-1.55.0-dev.tar.xz - 7z x rust-src-1.55.0-dev.tar - pushd rust-src-1.55.0-dev - cp -ErrorAction SilentlyContinue -Recurse .\rust-src\lib\* ..\esp\lib\ - popd - 7z a esp.zip esp/ - name: Upload Release Asset id: upload-release-asset uses: actions/upload-release-asset@v1 @@ -118,7 +86,5 @@ jobs: upload_url: ${{ needs.get_release.outputs.upload_url }} asset_path: ${{ matrix.ASSET_PATH }} asset_name: ${{ matrix.ASSET_NAME }} - # asset_path: build/dist/rust-1.55.0-dev-aarch64-apple-darwin.tar.xz - # asset_name: rust-1.55.0-dev-aarch64-apple-darwin.tar.xz asset_content_type: ${{ matrix.ASSET_CONTENT_TYPE }} diff --git a/.github/workflows/test-rust-aarch64-apple-darwin-dispatch.yaml b/.github/workflows/test-rust-aarch64-apple-darwin-dispatch.yaml index e17d7e5b..900992b4 100644 --- a/.github/workflows/test-rust-aarch64-apple-darwin-dispatch.yaml +++ b/.github/workflows/test-rust-aarch64-apple-darwin-dispatch.yaml @@ -33,51 +33,14 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - #os: [macos-latest, self-hosted-macos-arm64, ubuntu-latest, windows-latest] - #os: [macos-latest, ubuntu-18.04 ] - #os: [macos-latest, ubuntu-18.04, windows-latest] - #os: [ubuntu-18.04] - #os: [windows-latest] - # os: [macos-latest] - # os: [ [self-hosted, Windows, X64] ] - # os: [ [self-hosted, macOS, M1] ] os: [ macos-m1-self-hosted ] - # os: [ windows-self-hosted ] include: - os: macos-m1-self-hosted ARCH: '' - ASSET_PATH: 'build/dist/rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' - ASSET_NAME: 'rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' + ASSET_PATH: 'build/dist/rust-1.56.0-dev-aarch64-apple-darwin.tar.xz' + ASSET_NAME: 'rust-1.56.0-dev-aarch64-apple-darwin.tar.xz' ASSET_CONTENT_TYPE: 'application/x-tar' LLVM_ROOT_OPTION: '' - # - os: ubuntu-18.04 - # ARCH: '' - # TARGET: linux-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' - # ASSET_CONTENT_TYPE: 'application/x-tar' - # LLVM_ROOT_OPTION: '' - # - os: windows-latest - # ARCH: '' - # TARGET: win-x64 - # ASSET_PATH: 'build/dist/esp.zip' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-pc-windows-msvc.zip' - # ASSET_CONTENT_TYPE: 'application/zip' - # LLVM_ROOT_OPTION: '' - # - os: windows-self-hosted - # ARCH: '' - # TARGET: win-x64 - # ASSET_PATH: 'build/dist/esp.zip' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-pc-windows-msvc.zip' - # ASSET_CONTENT_TYPE: 'application/zip' - # LLVM_ROOT_OPTION: '--llvm-root=C:/llvm-project' - # - os: macos-m1-self-hosted - # ARCH: '' - # TARGET: win-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' - # ASSET_CONTENT_TYPE: 'application/x-tar' - # LLVM_ROOT_OPTION: '' steps: - name: Check out the repo uses: actions/checkout@v2 diff --git a/.github/workflows/test-rust-x86_64-apple-darwin-dispatch.yaml b/.github/workflows/test-rust-x86_64-apple-darwin-dispatch.yaml index 159cdc0c..ea48a655 100644 --- a/.github/workflows/test-rust-x86_64-apple-darwin-dispatch.yaml +++ b/.github/workflows/test-rust-x86_64-apple-darwin-dispatch.yaml @@ -9,52 +9,15 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - #os: [macos-latest, self-hosted-macos-arm64, ubuntu-latest, windows-latest] - #os: [macos-latest, ubuntu-18.04 ] - #os: [macos-latest, ubuntu-18.04, windows-latest] - #os: [ubuntu-18.04] - #os: [windows-latest] os: [macos-latest] - # os: [ [self-hosted, Windows, X64] ] - # os: [ [self-hosted, macOS, M1] ] - #os: [ windows-self-hosted, macos-m1-self-hosted ] - # os: [ windows-self-hosted ] include: - os: macos-latest ARCH: '' TARGET: macos-x64 - ASSET_PATH: 'build/dist/rust-1.55.0-dev-x86_64-apple-darwin.tar.xz' - ASSET_NAME: 'rust-1.55.0-dev-x86_64-x86_64-apple-darwin.tar.xz' + ASSET_PATH: 'build/dist/rust-1.56.0-dev-x86_64-apple-darwin.tar.xz' + ASSET_NAME: 'rust-1.56.0-dev-x86_64-x86_64-apple-darwin.tar.xz' ASSET_CONTENT_TYPE: 'application/x-tar' LLVM_ROOT_OPTION: '' - # - os: ubuntu-18.04 - # ARCH: '' - # TARGET: linux-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' - # ASSET_CONTENT_TYPE: 'application/x-tar' - # LLVM_ROOT_OPTION: '' - # - os: windows-latest - # ARCH: '' - # TARGET: win-x64 - # ASSET_PATH: 'build/dist/esp.zip' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-pc-windows-msvc.zip' - # ASSET_CONTENT_TYPE: 'application/zip' - # LLVM_ROOT_OPTION: '' - # - os: windows-self-hosted - # ARCH: '' - # TARGET: win-x64 - # ASSET_PATH: 'build/dist/esp.zip' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-pc-windows-msvc.zip' - # ASSET_CONTENT_TYPE: 'application/zip' - # LLVM_ROOT_OPTION: '--llvm-root=C:/llvm-project' - # - os: macos-m1-self-hosted - # ARCH: '' - # TARGET: win-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' - # ASSET_CONTENT_TYPE: 'application/x-tar' - # LLVM_ROOT_OPTION: '' steps: - name: Check out the repo uses: actions/checkout@v2 @@ -79,8 +42,8 @@ jobs: working-directory: rust-esp32-std-hello run: | cat ../export-rust.sh - export PATH="/Users/runner/.espressif/tools/xtensa-esp32-elf-clang/esp-12.0.1-20210823-x86_64-apple-darwin/bin/:$PATH" - export LIBCLANG_PATH="/Users/runner/.espressif/tools/xtensa-esp32-elf-clang/esp-12.0.1-20210823-x86_64-apple-darwin/lib/" + export PATH="/Users/runner/.espressif/tools/xtensa-esp32-elf-clang/esp-12.0.1-20210914-x86_64-apple-darwin/bin/:$PATH" + export LIBCLANG_PATH="/Users/runner/.espressif/tools/xtensa-esp32-elf-clang/esp-12.0.1-20210914-x86_64-apple-darwin/lib/" echo "Content of $LIBCLANG_PATH" ls $LIBCLANG_PATH source ../export-rust.sh diff --git a/.github/workflows/test-rust-x86_64-pc-windows-msvc-dispatch.yaml b/.github/workflows/test-rust-x86_64-pc-windows-msvc-dispatch.yaml index a84f2ac8..68a16720 100644 --- a/.github/workflows/test-rust-x86_64-pc-windows-msvc-dispatch.yaml +++ b/.github/workflows/test-rust-x86_64-pc-windows-msvc-dispatch.yaml @@ -9,52 +9,15 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - #os: [macos-latest, self-hosted-macos-arm64, ubuntu-latest, windows-latest] - #os: [macos-latest, ubuntu-18.04 ] - #os: [macos-latest, ubuntu-18.04, windows-latest] - #os: [ubuntu-18.04] os: [windows-latest] - # os: [macos-latest] - # os: [ [self-hosted, Windows, X64] ] - # os: [ [self-hosted, macOS, M1] ] - #os: [ windows-self-hosted, macos-m1-self-hosted ] - # os: [ windows-self-hosted ] include: - # - os: macos-latest - # ARCH: '' - # TARGET: macos-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-x86_64-apple-darwin.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-x86_64-apple-darwin.tar.xz' - # ASSET_CONTENT_TYPE: 'application/x-tar' - # LLVM_ROOT_OPTION: '' - # - os: ubuntu-18.04 - # ARCH: '' - # TARGET: linux-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' - # ASSET_CONTENT_TYPE: 'application/x-tar' - # LLVM_ROOT_OPTION: '' - os: windows-latest ARCH: '' TARGET: win-x64 ASSET_PATH: 'build/dist/esp.zip' - ASSET_NAME: 'rust-1.55.0-dev-x86_64-pc-windows-msvc.zip' + ASSET_NAME: 'rust-1.56.0-dev-x86_64-pc-windows-msvc.zip' ASSET_CONTENT_TYPE: 'application/zip' LLVM_ROOT_OPTION: '' - # - os: windows-self-hosted - # ARCH: '' - # TARGET: win-x64 - # ASSET_PATH: 'build/dist/esp.zip' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-pc-windows-msvc.zip' - # ASSET_CONTENT_TYPE: 'application/zip' - # LLVM_ROOT_OPTION: '--llvm-root=C:/llvm-project' - # - os: macos-m1-self-hosted - # ARCH: '' - # TARGET: win-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' - # ASSET_CONTENT_TYPE: 'application/x-tar' - # LLVM_ROOT_OPTION: '' steps: - name: Check out the repo uses: actions/checkout@v2 diff --git a/.github/workflows/test-rust-x86_64-pc-windows-msvc-self-hosted-dispatch.yaml b/.github/workflows/test-rust-x86_64-pc-windows-msvc-self-hosted-dispatch.yaml index c64c6419..2b8830d5 100644 --- a/.github/workflows/test-rust-x86_64-pc-windows-msvc-self-hosted-dispatch.yaml +++ b/.github/workflows/test-rust-x86_64-pc-windows-msvc-self-hosted-dispatch.yaml @@ -9,52 +9,15 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - #os: [macos-latest, self-hosted-macos-arm64, ubuntu-latest, windows-latest] - #os: [macos-latest, ubuntu-18.04 ] - #os: [macos-latest, ubuntu-18.04, windows-latest] - #os: [ubuntu-18.04] - # os: [windows-latest] - # os: [macos-latest] - # os: [ [self-hosted, Windows, X64] ] - # os: [ [self-hosted, macOS, M1] ] - #os: [ windows-self-hosted, macos-m1-self-hosted ] os: [ windows-self-hosted ] include: - # - os: macos-latest - # ARCH: '' - # TARGET: macos-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-x86_64-apple-darwin.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-x86_64-apple-darwin.tar.xz' - # ASSET_CONTENT_TYPE: 'application/x-tar' - # LLVM_ROOT_OPTION: '' - # - os: ubuntu-18.04 - # ARCH: '' - # TARGET: linux-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' - # ASSET_CONTENT_TYPE: 'application/x-tar' - # LLVM_ROOT_OPTION: '' - # - os: windows-latest - # ARCH: '' - # TARGET: win-x64 - # ASSET_PATH: 'build/dist/esp.zip' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-pc-windows-msvc.zip' - # ASSET_CONTENT_TYPE: 'application/zip' - # LLVM_ROOT_OPTION: '' - os: windows-self-hosted ARCH: '' TARGET: win-x64 ASSET_PATH: 'build/dist/esp.zip' - ASSET_NAME: 'rust-1.55.0-dev-x86_64-pc-windows-msvc.zip' + ASSET_NAME: 'rust-1.56.0-dev-x86_64-pc-windows-msvc.zip' ASSET_CONTENT_TYPE: 'application/zip' LLVM_ROOT_OPTION: '--llvm-root=C:/llvm-project' - # - os: macos-m1-self-hosted - # ARCH: '' - # TARGET: win-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' - # ASSET_CONTENT_TYPE: 'application/x-tar' - # LLVM_ROOT_OPTION: '' steps: - name: Check out the repo uses: actions/checkout@v2 diff --git a/.github/workflows/test-rust-x86_64-unknown-linux-gnu-dispatch.yaml b/.github/workflows/test-rust-x86_64-unknown-linux-gnu-dispatch.yaml index e485bb3b..a4fcf34a 100644 --- a/.github/workflows/test-rust-x86_64-unknown-linux-gnu-dispatch.yaml +++ b/.github/workflows/test-rust-x86_64-unknown-linux-gnu-dispatch.yaml @@ -9,52 +9,15 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - #os: [macos-latest, self-hosted-macos-arm64, ubuntu-latest, windows-latest] - #os: [macos-latest, ubuntu-18.04 ] - #os: [macos-latest, ubuntu-18.04, windows-latest] os: [ubuntu-18.04] - #os: [windows-latest] - # os: [macos-latest] - # os: [ [self-hosted, Windows, X64] ] - # os: [ [self-hosted, macOS, M1] ] - #os: [ windows-self-hosted, macos-m1-self-hosted ] - # os: [ windows-self-hosted ] include: - # - os: macos-latest - # ARCH: '' - # TARGET: macos-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-x86_64-apple-darwin.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-x86_64-apple-darwin.tar.xz' - # ASSET_CONTENT_TYPE: 'application/x-tar' - # LLVM_ROOT_OPTION: '' - os: ubuntu-18.04 ARCH: '' TARGET: linux-x64 - ASSET_PATH: 'build/dist/rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' - ASSET_NAME: 'rust-1.55.0-dev-x86_64-unknown-linux-gnu.tar.xz' + ASSET_PATH: 'build/dist/rust-1.56.0-dev-x86_64-unknown-linux-gnu.tar.xz' + ASSET_NAME: 'rust-1.56.0-dev-x86_64-unknown-linux-gnu.tar.xz' ASSET_CONTENT_TYPE: 'application/x-tar' LLVM_ROOT_OPTION: '' - # - os: windows-latest - # ARCH: '' - # TARGET: win-x64 - # ASSET_PATH: 'build/dist/esp.zip' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-pc-windows-msvc.zip' - # ASSET_CONTENT_TYPE: 'application/zip' - # LLVM_ROOT_OPTION: '' - # - os: windows-self-hosted - # ARCH: '' - # TARGET: win-x64 - # ASSET_PATH: 'build/dist/esp.zip' - # ASSET_NAME: 'rust-1.55.0-dev-x86_64-pc-windows-msvc.zip' - # ASSET_CONTENT_TYPE: 'application/zip' - # LLVM_ROOT_OPTION: '--llvm-root=C:/llvm-project' - # - os: macos-m1-self-hosted - # ARCH: '' - # TARGET: win-x64 - # ASSET_PATH: 'build/dist/rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' - # ASSET_NAME: 'rust-1.55.0-dev-aarch64-apple-darwin.tar.xz' - # ASSET_CONTENT_TYPE: 'application/x-tar' - # LLVM_ROOT_OPTION: '' steps: - name: Check out the repo uses: actions/checkout@v2 diff --git a/Dockerfile b/Dockerfile index c7e8d8b0..dfc8ea92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ENV LC_ALL=C.UTF-8 ENV LANG=C.UTF-8 ENV RUSTUP_HOME=/opt/rustup ENV CARGO_HOME=/opt/cargo -ENV PATH=/opt/cargo/bin:/opt/rustup/bin:/opt/esp/tools/xtensa-esp32-elf-clang/esp-12.0.1-20210823-x86_64-unknown-linux-gnu/bin/:$PATH +ENV PATH=/opt/cargo/bin:/opt/rustup/bin:/opt/esp/tools/xtensa-esp32-elf-clang/esp-12.0.1-20210914-x86_64-unknown-linux-gnu/bin/:$PATH WORKDIR /opt diff --git a/Install-RustToolchain.ps1 b/Install-RustToolchain.ps1 index 47b440c8..10a249fb 100644 --- a/Install-RustToolchain.ps1 +++ b/Install-RustToolchain.ps1 @@ -48,12 +48,12 @@ if ((rustfmt --version | Select-String -Pattern stable).Length -eq 0) { InstallRustFmt } -$Version="1.55.0-dev" +$Version="1.56.0-dev" $Arch="x86_64-pc-windows-msvc" $RustDist="rust-${Version}-${Arch}" $RustDistZipUrl="https://github.com/esp-rs/rust-build/releases/download/v${Version}/${RustDist}.zip" $ToolchainDestinationDir="${HOME}/.rustup/toolchains/esp" -$LlvmRelease="esp-12.0.1-20210823" +$LlvmRelease="esp-12.0.1-20210914" $IdfToolsPath="${HOME}/.espressif" $IdfToolXtensaElfClang="${IdfToolsPath}/tools/xtensa-esp32-elf-clang/${LlvmRelease}-${Arch}" $LlvmArch="win64" diff --git a/install-rust-toolchain.sh b/install-rust-toolchain.sh index 891d744c..84bbca2b 100755 --- a/install-rust-toolchain.sh +++ b/install-rust-toolchain.sh @@ -27,7 +27,7 @@ ARCH=`rustup show | grep "Default host" | sed -e 's/.* //'` #ARCH="x86_64-unknown-linux-gnu" #ARCH="x86_64-pc-windows-msvc" -LLVM_RELEASE="esp-12.0.1-20210823" +LLVM_RELEASE="esp-12.0.1-20210914" if [ ${ARCH} == "aarch64-apple-darwin" ]; then LLVM_ARCH="aarch64-apple-darwin" @@ -44,7 +44,7 @@ fi echo "Installation of toolchain for ${ARCH}" -VERSION="1.55.0-dev" +VERSION="1.56.0-dev" RUST_DIST="rust-${VERSION}-${ARCH}" RUST_SRC_DIST="rust-src-${VERSION}" if [ -z "${RUSTUP_HOME}" ]; then