diff --git a/.github/actions/util/setup-envs/action.yaml b/.github/actions/util/setup-envs/action.yaml index d9fef6d5..76880280 100644 --- a/.github/actions/util/setup-envs/action.yaml +++ b/.github/actions/util/setup-envs/action.yaml @@ -23,7 +23,7 @@ runs: # esp rust version to checkout echo "rust_ver=${{ github.event.inputs.rust_ver }}" >> $GITHUB_ENV - # Describes part of the file name generated during the build + # Describes part of the file name generated during the build echo "build_suffix=${{ github.event.inputs.rust_ver }}-dev-${{ matrix.target_name }}" >> $GITHUB_ENV # release version @@ -70,9 +70,9 @@ runs: # - name: Debug Output Env Variables # shell: bash # run: | -# echo "rust_ver: ${{ env.rust_ver }}" +# echo "rust_version: ${{ env.rust_ver }}" # echo "build_suffix: ${{ env.build_suffix }}" -# echo "release_ver: ${{ env.release_ver }}" +# echo "release_version: ${{ env.release_ver }}" # echo "asset_name: ${{ env.asset_name }}" # echo "work_dir: ${{ env.work_dir }}" # echo "dist_dir: ${{ env.dist_dir }}" diff --git a/.github/workflows/build-rust-aarch64-apple-darwin-dispatch.yaml b/.github/workflows/build-rust-aarch64-apple-darwin-dispatch.yaml index 353d5a64..c320a3d0 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.56.0-dev-aarch64-apple-darwin.tar.xz' - ASSET_NAME: 'rust-1.56.0.1-dev-aarch64-apple-darwin.tar.xz' + ASSET_PATH: 'build/dist/rust-1.57.0-dev-aarch64-apple-darwin.tar.xz' + ASSET_NAME: 'rust-1.57.0.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.56.0 + ref: esp-1.57.0.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' }} diff --git a/.github/workflows/build-rust-dispatch.yaml b/.github/workflows/build-rust-dispatch.yaml deleted file mode 100644 index d3b7a1a0..00000000 --- a/.github/workflows/build-rust-dispatch.yaml +++ /dev/null @@ -1,158 +0,0 @@ -name: build-rust-dispatch - -# on: -# push: -# tags: -# - 'v*' - -on: - workflow_dispatch - -jobs: - get_release: - # https://github.com/octokit/request-action - name: Get release - runs-on: ubuntu-latest - outputs: - upload_url: ${{ steps.get_upload_url.outputs.url }} - steps: - - uses: octokit/request-action@v2.x - id: get_latest_release - with: - route: GET /repos/{owner}/{repo}/releases/latest - owner: esp-rs - repo: rust-build - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: get upload url - id: get_upload_url - run: | - url=$(echo "$response" | jq -r '.upload_url') - echo "::set-output name=url::$url" - env: - response: ${{ steps.get_latest_release.outputs.data }} - - build-idf-rust: - name: Build IDF Rust for ${{ matrix.os }} - # needs: create_release - needs: get_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] ] - #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.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.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.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.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.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: - - name: Checkout repository - uses: actions/checkout@v2 - with: - repository: esp-rs/rust - 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' }} - 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 ${{ matrix.LLVM_ROOT_OPTION }} --experimental-targets=Xtensa --enable-extended --tools=rustfmt --dist-compression-formats='xz' - - name: Build with x.py - only components - if: ${{ matrix.os == 'windows-self-hosted' }} - 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: Build with x.py - dist packages - continue on error - problem with Long path on Windows - if: ${{ matrix.os == 'windows-latest' }} - continue-on-error: true - run: python3 x.py dist --stage 2 - - 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.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' }} - shell: pwsh - run: | - cd build/dist - mkdir esp - 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.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/ - - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.get_release.outputs.upload_url }} - asset_path: ${{ matrix.ASSET_PATH }} - asset_name: ${{ matrix.ASSET_NAME }} - # 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-src-dispatch.yaml b/.github/workflows/build-rust-src-dispatch.yaml index 6f57c2b0..01ace96a 100644 --- a/.github/workflows/build-rust-src-dispatch.yaml +++ b/.github/workflows/build-rust-src-dispatch.yaml @@ -7,14 +7,14 @@ on: description: 'Branch of rust-build to use' required: true default: 'main' - release_ver: + release_version: description: 'Release Version for generation' required: true - default: '1.56.0.1' - rust_ver: + default: '1.57.0.0' + rust_version: description: 'Version of esp rust to use' required: true - default: '1.56.0' + default: '1.57.0' jobs: @@ -70,13 +70,13 @@ jobs: - name: Read Artifact - Src uses: actions/download-artifact@v2 - with: - name: rust-src-${{ env.rust_ver }}-dev.tar.xz + with: + name: rust-src-${{ env.rust_version }}-dev.tar.xz - name: Rename file shell: bash run: | - mv rust-src-${{ env.rust_ver }}-dev.tar.xz rust-src-${{ env.release_ver }}.tar.xz - echo "asset_name=rust-src-${{ env.release_ver }}.tar.xz" >> $GITHUB_ENV + mv rust-src-${{ env.rust_version }}-dev.tar.xz rust-src-${{ env.release_version }}.tar.xz + echo "asset_name=rust-src-${{ env.release_version }}.tar.xz" >> $GITHUB_ENV - uses: ./rust-build/.github/actions/util/upload 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 2ee3e431..7d1be516 100644 --- a/.github/workflows/build-rust-x86_64-apple-darwin-dispatch.yaml +++ b/.github/workflows/build-rust-x86_64-apple-darwin-dispatch.yaml @@ -7,14 +7,14 @@ on: description: 'Branch of rust-build to use' required: true default: 'main' - release_ver: + release_version: description: 'Release Version for generation' required: true - default: '1.56.0.1' - rust_ver: + default: '1.57.0.0' + rust_version: description: 'Version of esp rust to use' required: true - default: '1.56.0' + default: '1.57.0' # We Break this down into individual jobs to avoid disk space issues 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 998eb814..a1953851 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 @@ -7,14 +7,14 @@ on: description: 'Branch of rust-build to use' required: true default: 'main' - release_ver: + release_version: description: 'Release Version for generation' required: true - default: '1.56.0.1' - rust_ver: + default: '1.57.0.0' + rust_version: description: 'Version of esp rust to use' required: true - default: '1.56.0' + default: '1.57.0' # We Break this down into individual jobs to avoid disk space issues 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 c9ab05bb..3144af86 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 @@ -7,14 +7,14 @@ on: description: 'Branch of rust-build to use' required: true default: 'main' - release_ver: + release_version: description: 'Release Version for generation' required: true - default: '1.56.0.1' - rust_ver: + default: '1.57.0.0' + rust_version: description: 'Version of esp rust to use' required: true - default: '1.56.0' + default: '1.57.0' # We Break this down into individual jobs to avoid disk space issues jobs: diff --git a/.github/workflows/test-rust-aarch64-apple-darwin-dispatch.yaml b/.github/workflows/test-rust-aarch64-apple-darwin-dispatch.yaml index 2be81839..ca6a06b5 100644 --- a/.github/workflows/test-rust-aarch64-apple-darwin-dispatch.yaml +++ b/.github/workflows/test-rust-aarch64-apple-darwin-dispatch.yaml @@ -10,7 +10,7 @@ on: toolchain_version: description: 'Version of Rust IDF toolchain' required: true - default: '1.56.0.1' + default: '1.57.0.0' target: description: 'Target to build (e.g. xtensa-esp32-espidf)' required: true @@ -50,8 +50,8 @@ jobs: include: - os: macos-m1-self-hosted ARCH: '' - 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_PATH: 'build/dist/rust-1.57.0-dev-aarch64-apple-darwin.tar.xz' + ASSET_NAME: 'rust-1.57.0.0-aarch64-apple-darwin.tar.xz' ASSET_CONTENT_TYPE: 'application/x-tar' LLVM_ROOT_OPTION: '' steps: 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 e8d82c73..a23faba1 100644 --- a/.github/workflows/test-rust-x86_64-apple-darwin-dispatch.yaml +++ b/.github/workflows/test-rust-x86_64-apple-darwin-dispatch.yaml @@ -10,7 +10,7 @@ on: toolchain_version: description: 'Version of Rust IDF toolchain' required: true - default: '1.56.0.1' + default: '1.57.0.0' jobs: build-idf-rust-examples: 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 e3dafa39..f1fae470 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 @@ -10,7 +10,7 @@ on: toolchain_version: description: 'Version of Rust IDF toolchain' required: true - default: '1.56.0.1' + default: '1.57.0.0' jobs: build-idf-rust-examples: 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 fa984410..feedc96f 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 @@ -20,7 +20,7 @@ jobs: ARCH: '' TARGET: win-x64 ASSET_PATH: 'build/dist/esp.zip' - ASSET_NAME: 'rust-1.56.0-dev-x86_64-pc-windows-msvc.zip' + ASSET_NAME: 'rust-1.57.0.0-x86_64-pc-windows-msvc.zip' ASSET_CONTENT_TYPE: 'application/zip' LLVM_ROOT_OPTION: '--llvm-root=C:/llvm-project' steps: 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 f19ff683..2663d490 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 @@ -10,7 +10,7 @@ on: toolchain_version: description: 'Version of Rust IDF toolchain' required: true - default: '1.56.0.1' + default: '1.57.0.0' jobs: build-idf-rust-examples: diff --git a/Install-RustToolchain.ps1 b/Install-RustToolchain.ps1 index 9136bb73..a7589cc9 100644 --- a/Install-RustToolchain.ps1 +++ b/Install-RustToolchain.ps1 @@ -4,7 +4,7 @@ param ( [String] $ExportFile = '', [String] - $ToolchainVersion = '1.56.0.1', + $ToolchainVersion = '1.57.0.0', [String] $ToolchainDestination = "${HOME}/.rustup/toolchains/esp", [String] diff --git a/README.md b/README.md index a74b92a4..ff2d2a00 100644 --- a/README.md +++ b/README.md @@ -38,8 +38,8 @@ Export variables displayed at the end of the script. Installation of different version of toolchain: ``` -./install-rust-toolchain.sh --toolchain-version 1.56.0.1 --export-file export-1.56.0.1.sh -source ./export-1.56.0.1.sh +./install-rust-toolchain.sh --toolchain-version 1.57.0.0 --export-file export-esp-rust.sh +source ./export-esp-rust.sh ``` #### Get source code of examples @@ -99,8 +99,8 @@ Export variables displayed at the end of the output from the script. Installation of different version of toolchain: ``` -./Install-RustToolchain.sh --toolchain-version 1.56.0.1 --export-file Export-1.56.0.1.ps1 -source ./Export-1.56.0.1.ps1 +./Install-RustToolchain.sh --toolchain-version 1.57.0.0 --export-file Export-EspRust.ps1 +source ./Export-EspRust.ps1 ``` #### Get source code of examples diff --git a/Test-RustToolchain.ps1 b/Test-RustToolchain.ps1 index e1e36def..80c0b380 100644 --- a/Test-RustToolchain.ps1 +++ b/Test-RustToolchain.ps1 @@ -2,7 +2,7 @@ param ( [Parameter()] [String] - $ToolchainVersion = '1.56.0.1', + $ToolchainVersion = '1.57.0.0', [String] [ValidateSet("xtensa-esp32-espidf", "xtensa-esp32s2-espidf", "xtensa-esp32s3-espidf", "riscv32imc-esp-espidf")] $Target = "xtensa-esp32-espidf", diff --git a/install-rust-toolchain.sh b/install-rust-toolchain.sh index ff89e59e..014ea4b4 100755 --- a/install-rust-toolchain.sh +++ b/install-rust-toolchain.sh @@ -1,7 +1,7 @@ #!/bin/bash # Default values -TOOLCHAIN_VERSION="1.56.0.1" +TOOLCHAIN_VERSION="1.57.0.0" if [ -z "${RUSTUP_HOME}" ]; then RUSTUP_HOME="${HOME}/.rustup" fi diff --git a/test-rust-toolchain.sh b/test-rust-toolchain.sh index 62869bb1..cccbb4a7 100755 --- a/test-rust-toolchain.sh +++ b/test-rust-toolchain.sh @@ -3,7 +3,7 @@ set -e # Default values -TOOLCHAIN_VERSION="1.56.0.1" +TOOLCHAIN_VERSION="1.57.0.0" if [ -z "${RUSTUP_HOME}" ]; then RUSTUP_HOME="${HOME}/.rustup" fi