ci: update

Author: eupn

.github/workflows/rust-xous-release.yml

@@ -6,61 +6,101 @@ jobs:
   build-libstd:
     runs-on: ubuntu-latest
 
-    steps:
-      - name: Setup riscv gnu/gcc toolchain
-        uses: gregdavill/[email protected]
+    strategy:
+      matrix:
+        target: [armv7a-unknown-xous-elf]
 
+    steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
           submodules: 'recursive'
 
-      - name: Determine Rust version
+      - name: Setup ARM Profile-A GCC toolchain
+        run: sudo apt install gcc-arm-none-eabi
+        if: matrix.target == 'armv7a-unknown-xous-elf'
+
+      - name: Extract Rust information.
         shell: bash
-        run: echo "version=$(echo ${GITHUB_REF} | cut -d/ -f3 | cut -d- -f1 | cut -d. -f1,2,3)" >> $GITHUB_OUTPUT
-        id: extract_rust_version
+        id: extract_rust_info
+        run: |
+          case "${{ matrix.target }}" in
+            riscv32imac-unknown-xous-elf)
+              target=riscv32imac-unknown-none-elf
+              target_cross_compile=riscv-none-embed
+            ;;
+
+            armv7a-unknown-xous-elf)
+              target=armv7a-none-eabi
+              target_cross_compile=arm-none-eabi
+            ;;
+          esac
+
+          if [[ ${GITHUB_REF} == *"nightly"* ]]; then
+            # Extract the nightly toolchain version in the format <version>-<nightly-yyyy-mm-dd>
+            echo "##[set-output name=version;]$(echo ${GITHUB_REF} | cut -d- -f2,3,4,5)"
+          else
+            echo "##[set-output name=version;]$(echo ${GITHUB_REF} | cut -d- -f1 | cut -d. -f1,2,3)"
+          fi
+
+          echo "##[set-output name=target;]$target"
+          echo "##[set-output name=cc;]$target_cross_compile-gcc"
+          echo "##[set-output name=ar;]$target_cross_compile-ar"
 
-      - name: Install Rust toolchain v${{ steps.extract_rust_version.outputs.version }}
+
+      - name: Install Rust toolchain v${{ steps.extract_rust_info.outputs.version }}
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: ${{ steps.extract_rust_version.outputs.version }}
+          toolchain: ${{ steps.extract_rust_info.outputs.version }}
           default: true
           override: true
-          target: riscv32imac-unknown-none-elf
+          target: ${{ steps.extract_rust_info.outputs.target }}
 
-      - name: Install riscv32imac-unknown-xous-elf toolchain file
+      - name: Install toolchain file
         run: |
-          rm -rf $(rustc --print sysroot)/lib/rustlib/riscv32imac-unknown-xous-elf \
-          && mkdir -p $(rustc --print sysroot)/lib/rustlib/riscv32imac-unknown-xous-elf/lib \
-          && rustc --version | awk '{print $2}' > $(rustc --print sysroot)/lib/rustlib/riscv32imac-unknown-xous-elf/RUST_VERSION
+          rm -rf $(rustc --print sysroot)/lib/rustlib/${{ matrix.target }} \
+          && mkdir -p $(rustc --print sysroot)/lib/rustlib/${{ matrix.target }}/lib \
+          && cp ${{ matrix.target }}.json $(rustc --print sysroot)/lib/rustlib/${{ matrix.target }}/target.json \
+          && rustc --version | awk '{print $2}' > $(rustc --print sysroot)/lib/rustlib/${{ matrix.target }}/RUST_VERSION
+
+      - name: Patch LLVM for 128-bit support
+        run: sed -i '/^#define CRT_HAS_128BIT/d' src/llvm-project/compiler-rt/lib/builtins/int_types.h
+
+      - uses: webfactory/[email protected]
+        with:
+          ssh-private-key: |
+            ${{ secrets.SSH_KEY }}
+            ${{ secrets.SSH_KEY_AT91BOOTSTRAP }}
+            ${{ secrets.SSH_KEY_AT91BOOTSTRAP_FFI }}
 
       - name: Build Rust libstd
         run: |
           export RUST_COMPILER_RT_ROOT=$(pwd)/src/llvm-project/compiler-rt \
           && rm -rf target \
           && cargo build \
-            --target riscv32imac-unknown-xous-elf \
+            --target ${{ matrix.target }} \
             -Zbinary-dep-depinfo \
             --release \
             --features "panic-unwind compiler-builtins-c compiler-builtins-mem" \
             --manifest-path "library/sysroot/Cargo.toml" \
-          && cp library/target/riscv32imac-unknown-xous-elf/release/deps/*.rlib $(rustc --print sysroot)/lib/rustlib/riscv32imac-unknown-xous-elf/lib \
-          && (dest=$(pwd) && cd $(rustc --print sysroot) && zip -r ${dest}/riscv32imac-unknown-xous_${{ steps.extract_rust_version.outputs.version }}.zip lib/rustlib/riscv32imac-unknown-xous-elf/)
+          && cp library/target/${{ matrix.target }}/release/deps/*.rlib $(rustc --print sysroot)/lib/rustlib/${{ matrix.target }}/lib \
+          && (dest=$(pwd) && cd $(rustc --print sysroot) && zip -r ${dest}/${{ matrix.target }}_${{ steps.extract_rust_info.outputs.version }}.zip lib/rustlib/${{ matrix.target }}/)
         env:
+          CARGO_NET_GIT_FETCH_WITH_CLI: true
           CARGO_PROFILE_RELEASE_DEBUG: 0
-          CARGO_PROFILE_RELEASE_OPT_LEVEL: 3
           CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS: false
+          CARGO_PROFILE_RELEASE_OPT_LEVEL: 3
           RUSTC_BOOTSTRAP: 1
-          RUSTFLAGS: -Cforce-unwind-tables=yes -Cembed-bitcode=yes -Zforce-unstable-if-unmarked
+          RUSTFLAGS: --cfg keyos --check-cfg=cfg(keyos) -Cforce-unwind-tables=yes -Cembed-bitcode=yes -Zforce-unstable-if-unmarked
           __CARGO_DEFAULT_LIB_METADATA: stablestd
-          CC: riscv-none-embed-gcc
-          AR: riscv-none-embed-ar
+          CC: ${{ steps.extract_rust_info.outputs.cc }}
+          AR: ${{ steps.extract_rust_info.outputs.ar }}
 
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
-            riscv32imac-unknown-xous_${{ steps.extract_rust_version.outputs.version }}.zip
+            ${{ matrix.target }}_${{ steps.extract_rust_info.outputs.version }}.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}