build: prepare 1.56.0 release

esp-rs · Oct 21, 2021 · 4d6c96c · 4d6c96c
1 parent 9f18cc3
commit 4d6c96c
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 430 deletions.
diff --git a/.github/workflows/build-rust-aarch64-apple-darwin-dispatch.yaml b/.github/workflows/build-rust-aarch64-apple-darwin-dispatch.yaml
@@ -40,16 +40,16 @@ 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:
       - 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' }}
@@ -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
@@ -53,44 +53,44 @@ 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:
       - 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' }}
@@ -121,25 +121,25 @@ 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' }}
         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
+          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
@@ -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
@@ -34,29 +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: [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:
       - 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' }}
@@ -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
@@ -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,25 +74,25 @@ 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' }}
         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
+          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 }}