Add support for riscv64gc-unknown-linux-musl target (#182)

* Add support for riscv64gc-unknown-linux-musl target

* fix

* Try build mips with Rust stable

* CI-no-fail-fast

* Don't fail fast

* Update test crate

* Disable mips* targets

* Use 2021 edition for custom std

* Disable riscv64 test cargo build

openssl doesn't build

Author: messense

.github/workflows/Build.yml

@@ -1,26 +1,21 @@
 on:
-  push:
-    branches:
-      # for bors r+
-      - staging
-      # for bors try
-      - trying
+  pull_request:
   workflow_dispatch:
     inputs:
       no_cache:
         description: Disable Docker cache, yes/no
-        default: 'no'
+        default: "no"
         required: false
       toolchain:
         description: Rust toolchain to install
-        default: 'stable'
+        default: "stable"
         required: false
       arch:
         description: Architectures to build for
-        default: ''
+        default: ""
         required: false
   schedule:
-    - cron: '0 0 1 */2 *'
+    - cron: "0 0 1 */2 *"
 
 name: Build
 
@@ -48,11 +43,7 @@ jobs:
             const archMatrix = yaml.load(process.env.ARCH_MATRIX)
             const targetMatrix = yaml.load(process.env.TARGET_MATRIX)
 
-            if (context.eventName == 'schedule') {
-              // Always run on schedule
-              core.setOutput('arch', JSON.stringify(archMatrix))
-              core.setOutput('target', JSON.stringify(targetMatrix))
-            } else if (context.eventName == 'workflow_dispatch') {
+            if (context.eventName == 'workflow_dispatch') {
               let outputArchMatrix = []
               let outputTargetMatrix = []
               const dockerArch = context.payload.inputs.arch.split(',')
@@ -75,84 +66,10 @@ jobs:
               core.setOutput('arch', JSON.stringify(outputArchMatrix))
               core.setOutput('target', JSON.stringify(outputTargetMatrix))
               core.setOutput('fail-fast', 'false')
-            } else if (context.eventName == 'push') {
-              const commitMessage = process.env.COMMIT_MESSAGE.trim()
-              if (commitMessage.length > 0) {
-                let outputArchMatrix = []
-                let outputTargetMatrix = []
-
-                let borsArgs
-                if (commitMessage.startsWith('Try #')) {
-                  borsArgs = commitMessage.replace(/Try #[0-9]+:/i, '').trim()
-                } else {
-                  // Merge example commit message:
-                  // Merge #64
-                  //
-                  // 64: Refine bors command r=messense a=messense
-                  //
-                  // bors: amd64 --target aarch64
-                  //
-                  // Co-authored-by: messense <messense@icloud.com>
-                  //
-                  borsArgs = commitMessage
-                    .split('\n')
-                    .filter(item => item.trim().startsWith('bors:'))
-                    .join('\n')
-                    .trim()
-                }
-                const targetIndex = borsArgs.indexOf('--target')
-                let dockerArch = []
-                let targets = []
-
-                if (targetIndex === -1) {
-                  dockerArch = borsArgs.trim().split(' ').filter(x => x.length > 0)
-                  targets = []
-                } else {
-                  dockerArch = borsArgs.substring(0, targetIndex).trim().split(' ').filter(x => x.length > 0)
-                  targets = borsArgs.substring(targetIndex + '--target'.length).trim().split(' ')
-                }
-                if (dockerArch.length === 0) {
-                  // Defaults to all arches
-                  outputArchMatrix = archMatrix
-                } else {
-                  for (const arch of dockerArch) {
-                    outputArchMatrix.push(...archMatrix.filter(item => item.arch == arch))
-                  }
-                }
-                if (targets.length === 0) {
-                  // Defaults to all targets
-                  outputTargetMatrix = targetMatrix
-                } else {
-                  for (const target of targets) {
-                    outputTargetMatrix.push(...targetMatrix.filter(item => item.TARGET.startsWith(target)))
-                  }
-                }
-
-                core.setOutput('arch', JSON.stringify(outputArchMatrix))
-                core.setOutput('target', JSON.stringify(outputTargetMatrix))
-              } else {
-                core.setOutput('arch', JSON.stringify(archMatrix))
-                core.setOutput('target', JSON.stringify(targetMatrix))
-                core.setOutput('run-build', 'false')
-              }
-
-              const matches = commitMessage.match(/(Try|Merge) #([0-9]+):/)
-              if (matches) {
-                const prNumber = matches[2]
-                const { data: { labels: labels } } = await github.rest.pulls.get({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  pull_number: prNumber
-                })
-                const labelNames = labels.map(label => label.name)
-                if (labelNames.includes('CI-no-fail-fast')) {
-                  core.setOutput('fail-fast', 'false')
-                }
-              }
             } else {
               core.setOutput('arch', JSON.stringify(archMatrix))
               core.setOutput('target', JSON.stringify(targetMatrix))
-              core.setOutput('run-build', 'false')
+              core.setOutput('fail-fast', 'false')
             }
       - name: Show build matrix
         run: |
@@ -170,11 +87,11 @@ jobs:
           }}
       ARCH_MATRIX: |
         - arch: amd64
-          runner: [ubuntu-latest]
+          runner: ubuntu-latest
         - arch: arm64
-          runner: [self-hosted, ARM64]
+          runner: ubuntu-24.04-arm
         - arch: armv7
-          runner: [self-hosted, ARM64]
+          runner: ubuntu-24.04-arm
           docker_arch: arm/v7
       TARGET_MATRIX: |
         - IMAGE_TAG: aarch64-musl
@@ -213,26 +130,31 @@ jobs:
           TARGET: powerpc64le-unknown-linux-musl
           RUST_MUSL_MAKE_CONFIG: config.mak
           TOOLCHAIN: stable
-        - IMAGE_TAG: mips-musl
-          TARGET: mips-unknown-linux-musl
-          RUST_MUSL_MAKE_CONFIG: config.mak
-          TOOLCHAIN: nightly
-        - IMAGE_TAG: mips64-muslabi64
-          TARGET: mips64-unknown-linux-muslabi64
-          RUST_MUSL_MAKE_CONFIG: config.mak
-          TOOLCHAIN: nightly
-        - IMAGE_TAG: mips64el-muslabi64
-          TARGET: mips64el-unknown-linux-muslabi64
-          RUST_MUSL_MAKE_CONFIG: config.mak
-          TOOLCHAIN: nightly
-        - IMAGE_TAG: mipsel-musl
-          TARGET: mipsel-unknown-linux-musl
-          RUST_MUSL_MAKE_CONFIG: config.mak
-          TOOLCHAIN: nightly
+        # - IMAGE_TAG: mips-musl
+        #   TARGET: mips-unknown-linux-musl
+        #   RUST_MUSL_MAKE_CONFIG: config.mak
+        #   TOOLCHAIN: stable
+        # - IMAGE_TAG: mips64-muslabi64
+        #   TARGET: mips64-unknown-linux-muslabi64
+        #   RUST_MUSL_MAKE_CONFIG: config.mak
+        #   TOOLCHAIN: stable
+        # - IMAGE_TAG: mips64el-muslabi64
+        #   TARGET: mips64el-unknown-linux-muslabi64
+        #   RUST_MUSL_MAKE_CONFIG: config.mak
+        #   TOOLCHAIN: stable
+        # - IMAGE_TAG: mipsel-musl
+        #   TARGET: mipsel-unknown-linux-musl
+        #   RUST_MUSL_MAKE_CONFIG: config.mak
+        #   TOOLCHAIN: stable
         - IMAGE_TAG: s390x-musl
           TARGET: s390x-unknown-linux-musl
           RUST_MUSL_MAKE_CONFIG: config.mak
           TOOLCHAIN: nightly
+        - IMAGE_TAG: riscv64gc-musl
+          TARGET: riscv64gc-unknown-linux-musl
+          MUSL_TARGET: riscv64-unknown-linux-musl
+          RUST_MUSL_MAKE_CONFIG: config.mak
+          TOOLCHAIN: stable
         - IMAGE_TAG: x86_64-musl
           TARGET: x86_64-unknown-linux-musl
           RUST_MUSL_MAKE_CONFIG: config.mak
@@ -251,11 +173,6 @@ jobs:
     env: ${{ matrix.env }}
     steps:
       - uses: actions/checkout@v4
-      - name: Setup QEMU
-        uses: dbhi/qus/action@main
-        if: ${{ contains(matrix.os.runner, 'ubuntu-latest') }}
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         if: ${{ github.repository_owner == 'rust-cross' }}
         uses: docker/login-action@v3
@@ -268,12 +185,17 @@ jobs:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: docker build
         uses: docker/build-push-action@v6
         with:
           platforms: linux/${{ matrix.os.docker_arch || matrix.os.arch }}
           build-args: |
             TARGET=${{ matrix.env.TARGET }}
+            MUSL_TARGET=${{ matrix.env.MUSL_TARGET || matrix.env.TARGET }}
             RUST_MUSL_MAKE_CONFIG=${{ matrix.env.RUST_MUSL_MAKE_CONFIG }}
             TOOLCHAIN=${{ matrix.env.TOOLCHAIN }}
           tags: ghcr.io/${{ github.repository_owner }}/rust-musl-cross:${{ matrix.env.IMAGE_TAG }}-${{ matrix.os.arch }}
@@ -283,12 +205,13 @@ jobs:
           cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/rust-musl-cross:buildcache-${{ matrix.env.IMAGE_TAG }}-${{ matrix.os.arch }}
           cache-to: type=registry,ref=ghcr.io/${{ github.repository_owner }}/rust-musl-cross:buildcache-${{ matrix.env.IMAGE_TAG }}-${{ matrix.os.arch }},mode=max
       - name: Test Docker cargo build
-        if: ${{ matrix.os.arch == 'amd64' && !startsWith(matrix.env.TARGET, 'armv5te') && !startsWith(matrix.env.TARGET, 's390x') }}
+        if: ${{ matrix.os.arch == 'amd64' && !startsWith(matrix.env.TARGET, 'armv5te') && !startsWith(matrix.env.TARGET, 's390x') && !startsWith(matrix.env.TARGET, 'riscv64') }}
         run: |
           docker run --rm \
             -v "$(pwd)/tests":/home/rust/src \
             ghcr.io/${{ github.repository_owner }}/rust-musl-cross:$IMAGE_TAG-${{ matrix.os.arch }} bash -c "cargo build"
       - name: Build and push multiarch image
+        if: ${{ github.event_name != 'pull_request' }}
         env:
           DOCKER_CLI_EXPERIMENTAL: enabled
         run: |
@@ -330,12 +253,12 @@ jobs:
           sed -n '1d;p' ghcr-manifest.yaml >> ghcr-manifest-target.yaml
           ./manifest-tool push from-spec ghcr-manifest-target.yaml
       - name: Sync images to Docker Hub
-        if: ${{ github.repository_owner == 'rust-cross' }}
+        if: ${{ github.repository_owner == 'rust-cross' && github.event_name != 'pull_request' }}
         env:
           DOCKER_CLI_EXPERIMENTAL: enabled
         run: |
           set -e
-          
+
           echo "image: ${{ secrets.DOCKER_USERNAME }}/rust-musl-cross:$IMAGE_TAG
           manifests:" > dockerhub-manifest.yaml
 

Dockerfile

@@ -8,51 +8,45 @@ ENV DEBIAN_FRONTEND=noninteractive
 #
 RUN apt-get update && \
     apt-get install -y \
-        build-essential \
-        cmake \
-        curl \
-        file \
-        git \
-        sudo \
-        xutils-dev \
-        unzip \
-        ca-certificates \
-        python3 \
-        python3-pip \
-        autoconf \
-        autoconf-archive \
-        automake \
-        flex \
-        bison \
-        llvm-dev \
-        libclang-dev \
-        clang \
-        && \
+    build-essential \
+    cmake \
+    curl \
+    file \
+    git \
+    sudo \
+    xutils-dev \
+    unzip \
+    ca-certificates \
+    python3 \
+    python3-pip \
+    autoconf \
+    autoconf-archive \
+    automake \
+    flex \
+    bison \
+    llvm-dev \
+    libclang-dev \
+    clang \
+    && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Install Let's Encrypt R3 CA certificate from https://letsencrypt.org/certificates/
 COPY lets-encrypt-r3.crt /usr/local/share/ca-certificates
 RUN update-ca-certificates
 
 ARG TARGET=x86_64-unknown-linux-musl
-ENV RUST_MUSL_CROSS_TARGET=$TARGET
+ARG MUSL_TARGET=$TARGET
+ENV RUST_MUSL_CROSS_TARGET=$MUSL_TARGET
 ARG RUST_MUSL_MAKE_CONFIG=config.mak
 
 COPY $RUST_MUSL_MAKE_CONFIG /tmp/config.mak
-# Fix the cfi detection script in musl's configure so cfi is generated
-# when debug info is asked for. This patch is derived from
-# https://git.musl-libc.org/cgit/musl/commit/?id=c4d4028dde90562f631edf559fbc42d8ec1b29de.
-# When we upgrade to a version that includes this commit, we can remove the patch.
-COPY musl-patch-configure.diff /tmp/musl-patch-configure.diff
 
 RUN cd /tmp && \
     git clone --depth 1 https://github.com/richfelker/musl-cross-make.git && \
     cp /tmp/config.mak /tmp/musl-cross-make/config.mak && \
     cd /tmp/musl-cross-make && \
-    mkdir -p patches/musl-1.1.24 && \
-    cp /tmp/musl-patch-configure.diff patches/musl-1.1.24/0001-fix-cfi-detection.diff && \
     export CFLAGS="-fPIC -g1 $CFLAGS" && \
-    export TARGET=$TARGET && \
+    export TARGET=$MUSL_TARGET && \
     if [ `dpkg --print-architecture` = 'armhf' ] && [ `uname -m` = 'aarch64' ]; then SETARCH=linux32; else SETARCH= ; fi && \
     $SETARCH make -j$(nproc) > /tmp/musl-cross-make.log && \
     $SETARCH make install >> /tmp/musl-cross-make.log && \
@@ -65,11 +59,11 @@ RUN mkdir -p /home/rust/libs /home/rust/src
 # Set up our path with all our binary directories, including those for the
 # musl-gcc toolchain and for our Rust toolchain.
 ENV PATH=/root/.cargo/bin:/usr/local/musl/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV TARGET_CC=$TARGET-gcc
-ENV TARGET_CXX=$TARGET-g++
-ENV TARGET_AR=$TARGET-ar
-ENV TARGET_RANLIB=$TARGET-ranlib
-ENV TARGET_HOME=/usr/local/musl/$TARGET
+ENV TARGET_CC=$MUSL_TARGET-gcc
+ENV TARGET_CXX=$MUSL_TARGET-g++
+ENV TARGET_AR=$MUSL_TARGET-ar
+ENV TARGET_RANLIB=$MUSL_TARGET-ranlib
+ENV TARGET_HOME=/usr/local/musl/$MUSL_TARGET
 ENV TARGET_C_INCLUDE_PATH=$TARGET_HOME/include/
 
 # pkg-config cross compilation support
@@ -117,7 +111,7 @@ RUN chmod 755 /root/ && \
     rustup component add --toolchain $TOOLCHAIN rustfmt clippy && \
     rm -rf /root/.rustup/toolchains/$TOOLCHAIN-$GNU_TARGET/share/
 
-RUN echo "[target.$TARGET]\nlinker = \"$TARGET-gcc\"\n" > /root/.cargo/config.toml
+RUN echo "[target.$TARGET]\nlinker = \"$TARGET_CC\"\n" > /root/.cargo/config.toml
 
 # Build std sysroot for targets that doesn't have official std release
 ADD Xargo.toml /tmp/Xargo.toml

README.md

@@ -24,10 +24,10 @@ Currently we have the following [prebuilt Docker images on Docker Hub](https://h
 | stable         | armv7-unknown-linux-musleabihf   | armv7-musleabihf   |
 | stable         | i586-unknown-linux-musl          | i586-musl          |
 | stable         | i686-unknown-linux-musl          | i686-musl          |
-| nightly        | mips-unknown-linux-musl          | mips-musl          |
-| nightly        | mipsel-unknown-linux-musl        | mipsel-musl        |
-| nightly        | mips64-unknown-linux-muslabi64   | mips64-muslabi64   |
-| nightly        | mips64el-unknown-linux-muslabi64 | mips64el-muslabi64 |
+| stable         | mips-unknown-linux-musl          | mips-musl          |
+| stable         | mipsel-unknown-linux-musl        | mipsel-musl        |
+| stable         | mips64-unknown-linux-muslabi64   | mips64-muslabi64   |
+| stable         | mips64el-unknown-linux-muslabi64 | mips64el-muslabi64 |
 | stable         | powerpc64le-unknown-linux-musl   | powerpc64le-musl   |
 | stable         | x86\_64-unknown-linux-musl       | x86\_64-musl       |
 

build-std.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-if [[ "$TOOLCHAIN" = "nightly" && ("$TARGET" =~ ^mips || "$TARGET" =~ ^s390x) ]]
+if [[ "$TOOLCHAIN" = "nightly" && ("$TARGET" =~ ^s390x) ]]
 then
   export CARGO_NET_GIT_FETCH_WITH_CLI=true
   export CARGO_UNSTABLE_SPARSE_REGISTRY=true
@@ -15,7 +15,7 @@ then
   fi
 
   cargo install xargo --git https://github.com/AverseABFun/xargo.git
-  cargo new --lib custom-std
+  cargo new --lib --edition 2021 custom-std
   cd custom-std
   cp /tmp/Xargo.toml .
   rustc -Z unstable-options --print target-spec-json --target "$TARGET" | tee "$TARGET.json"