From affe8fb7190df5bfded883bcc23f2cb477fd49a4 Mon Sep 17 00:00:00 2001 From: lixianjiang Date: Wed, 17 Sep 2025 08:41:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9rust.yml=E6=96=87?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=BA=91=E7=BC=96=E8=AF=91=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/rust.yml | 227 ++++++++++++++++++------------------- Cargo.lock | 49 +++++++- 2 files changed, 157 insertions(+), 119 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 7774898..1e652b8 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -11,85 +11,67 @@ permissions: contents: write defaults: run: - # necessary for windows shell: bash jobs: - # test: - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v2 - # - name: Init submodules - # uses: snickerbockers/submodules-init@v4 - # - name: Cargo cache - # uses: actions/cache@v2 - # with: - # path: | - # ~/.cargo/registry - # ./target - # key: test-cargo-registry - # - name: List - # run: find ./ - # - name: Run tests - # run: cargo test --verbose - build: strategy: fail-fast: false matrix: - # a list of all the targets - # 选择使用openssl或者ring，并不是所有平台都支持 include: - - TARGET: i686-unknown-linux-musl # test in an alpine container on a mac - OS: ubuntu-latest - FEATURES: ring-cipher,openssl-vendored,wss - - TARGET: x86_64-unknown-linux-musl # test in an alpine container on a mac + # - TARGET: i686-unknown-linux-musl + # OS: ubuntu-latest + # FEATURES: ring-cipher,openssl-vendored,wss + - TARGET: x86_64-unknown-linux-musl OS: ubuntu-latest FEATURES: ring-cipher,wss - - TARGET: aarch64-unknown-linux-musl # tested on aws t4g.nano in alpine container + - TARGET: aarch64-unknown-linux-musl OS: ubuntu-latest FEATURES: ring-cipher,wss - - TARGET: armv7-unknown-linux-musleabihf # raspberry pi 2-3-4, not tested + - TARGET: armv7-unknown-linux-musleabihf OS: ubuntu-latest FEATURES: ring-cipher,wss - - TARGET: armv7-unknown-linux-musleabi # raspberry pi 2-3-4, not tested + - TARGET: armv7-unknown-linux-musleabi OS: ubuntu-latest FEATURES: ring-cipher,wss - - TARGET: arm-unknown-linux-musleabihf # raspberry pi 0-1, not tested + - TARGET: arm-unknown-linux-musleabihf OS: ubuntu-latest FEATURES: ring-cipher,wss - - TARGET: arm-unknown-linux-musleabi # raspberry pi 0-1, not tested + - TARGET: arm-unknown-linux-musleabi OS: ubuntu-latest FEATURES: ring-cipher,wss - - TARGET: x86_64-apple-darwin # tested on a mac, is not properly signed so there are security warnings + - TARGET: x86_64-apple-darwin OS: macos-latest FEATURES: ring-cipher,wss - - TARGET: aarch64-apple-darwin # tested on a mac, is not properly signed so there are security warnings + - TARGET: aarch64-apple-darwin OS: macos-latest FEATURES: ring-cipher,wss - - TARGET: i686-pc-windows-msvc # tested on a windows machine - OS: windows-2019 - FEATURES: ring-cipher,wss - - TARGET: x86_64-pc-windows-msvc # tested on a windows machine + - TARGET: i686-pc-windows-msvc OS: windows-latest FEATURES: ring-cipher,wss - - TARGET: mipsel-unknown-linux-musl # openwrt + - TARGET: x86_64-pc-windows-msvc + OS: windows-latest + FEATURES: ring-cipher,wss + - TARGET: mipsel-unknown-linux-musl OS: ubuntu-latest FEATURES: ring-cipher,wss - - TARGET: mips-unknown-linux-musl # openwrt + - TARGET: mips-unknown-linux-musl OS: ubuntu-latest FEATURES: ring-cipher,wss - # needs: test + runs-on: ${{ matrix.OS }} env: - NAME: vnt-cli # change with the name of your project + NAME: vnt-cli TARGET: ${{ matrix.TARGET }} OS: ${{ matrix.OS }} FEATURES: ${{ matrix.FEATURES }} + steps: - uses: actions/checkout@v4 + - name: Init submodules - uses: snickerbockers/submodules-init@v4 + run: git submodule update --init --recursive --remote && git submodule status + - name: Cargo cache uses: actions/cache@v4 with: @@ -97,76 +79,85 @@ jobs: ~/.cargo/registry ./target key: build-cargo-registry-${{matrix.TARGET}} + - name: Use strawberry perl - if: startsWith(matrix.os, 'windows') + if: startsWith(matrix.OS, 'windows') run: echo OPENSSL_SRC_PERL=C:/Strawberry/perl/bin/perl >> $GITHUB_ENV + - name: List run: find ./ - - name: Install and configure dependencies + + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: nightly + profile: minimal + override: true + + - name: Verify Rust version run: | - # dependencies are only needed on ubuntu as that's the only place where - # we make cross-compilation - rustup set auto-self-update disable - - if [[ $OS =~ ^ubuntu.*$ ]]; then - sudo apt-get update && sudo apt-get install clang llvm libc6-dev-i386 crossbuild-essential-arm64 crossbuild-essential-armhf musl-tools libboost-all-dev libc6-dev -y - # curl -s musl.cc | grep mipsel - case $TARGET in - mipsel-unknown-linux-musl) - MUSL_URI=mipsel-linux-muslsf-cross - URL=mipsel-linux-muslsf - ;; - aarch64-unknown-linux-musl) - MUSL_URI=aarch64-linux-musl-cross - ;; - armv7-unknown-linux-musleabihf) - MUSL_URI=armv7l-linux-musleabihf-cross - ;; - armv7-unknown-linux-musleabi) - MUSL_URI=armv7m-linux-musleabi-cross - ;; - arm-unknown-linux-musleabihf) - MUSL_URI=arm-linux-musleabihf-cross - ;; - arm-unknown-linux-musleabi) - MUSL_URI=arm-linux-musleabi-cross - ;; - mips-unknown-linux-musl) - MUSL_URI=mips-linux-muslsf-cross - URL=mips-linux-muslsf - ;; - i686-unknown-linux-musl) - MUSL_URI=i686-linux-musl-cross - ;; - esac - - if [ -n "$MUSL_URI" ]; then - mkdir -p /opt/musl_gcc - wget -c https://musl.cc/$MUSL_URI.tgz -P /opt/musl_gcc/ - tar zxf /opt/musl_gcc/$MUSL_URI.tgz -C /opt/musl_gcc/ - sudo ln -s /opt/musl_gcc/$MUSL_URI/bin/*gcc /usr/bin/ - fi - else - rustup install 1.77 - rustup default 1.77 + rustc --version + cargo --version + + - name: Install dependencies on Ubuntu + if: startsWith(matrix.OS, 'ubuntu') + run: | + sudo apt-get update && sudo apt-get install -y clang llvm libc6-dev-i386 \ + crossbuild-essential-arm64 crossbuild-essential-armhf musl-tools libboost-all-dev libc6-dev wget tar + + # Install musl cross toolchains if needed + case $TARGET in + mipsel-unknown-linux-musl) + MUSL_URI=mipsel-linux-muslsf-cross + URL=mipsel-linux-muslsf + ;; + aarch64-unknown-linux-musl) + MUSL_URI=aarch64-linux-musl-cross + ;; + armv7-unknown-linux-musleabihf) + MUSL_URI=armv7l-linux-musleabihf-cross + ;; + armv7-unknown-linux-musleabi) + MUSL_URI=armv7m-linux-musleabi-cross + ;; + arm-unknown-linux-musleabihf) + MUSL_URI=arm-linux-musleabihf-cross + ;; + arm-unknown-linux-musleabi) + MUSL_URI=arm-linux-musleabi-cross + ;; + mips-unknown-linux-musl) + MUSL_URI=mips-linux-muslsf-cross + URL=mips-linux-muslsf + ;; + i686-unknown-linux-musl) + MUSL_URI=i686-linux-musl-cross + ;; + esac + + if [ -n "$MUSL_URI" ]; then + mkdir -p /opt/musl_gcc + wget -c https://github.com/rustp2p/musl-cross/releases/download/0.0.1/$MUSL_URI.tgz -P /opt/musl_gcc/ + tar zxf /opt/musl_gcc/$MUSL_URI.tgz -C /opt/musl_gcc/ + sudo ln -s /opt/musl_gcc/$MUSL_URI/bin/*gcc /usr/bin/ fi + if [[ $TARGET =~ ^mips.*$ ]]; then - # mips平台使用nightly版本 - cd /opt/musl_gcc/${URL}-cross/lib/gcc/${URL}/11.2.1 - cp libgcc_eh.a libunwind.a - rustup toolchain install nightly-x86_64-unknown-linux-gnu - rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu - RUST_LIB_SRC=$HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/ - if [[ -f $RUST_LIB_SRC/library/Cargo.lock && ! -f $RUST_LIB_SRC/Cargo.lock ]]; then - cp -f $RUST_LIB_SRC/library/Cargo.lock $RUST_LIB_SRC/Cargo.lock - fi - else - rustup install 1.77 - rustup default 1.77 + cd /opt/musl_gcc/${URL}-cross/lib/gcc/${URL}/11.2.1 + cp libgcc_eh.a libunwind.a + rustup toolchain install nightly-x86_64-unknown-linux-gnu + rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu + RUST_LIB_SRC=$HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/ + if [[ -f $RUST_LIB_SRC/library/Cargo.lock && ! -f $RUST_LIB_SRC/Cargo.lock ]]; then + cp -f $RUST_LIB_SRC/library/Cargo.lock $RUST_LIB_SRC/Cargo.lock + fi fi - rustup -V - - # some additional configuration for cross-compilation on linux + + rustup -V + + + - name: Configure cargo for cross-compilation + run: | cat >>~/.cargo/config < Date: Wed, 17 Sep 2025 09:30:52 +0800 Subject: [PATCH 2/2] Update rust.yml --- .github/workflows/rust.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1e652b8..9af16a0 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -19,9 +19,9 @@ jobs: fail-fast: false matrix: include: - # - TARGET: i686-unknown-linux-musl - # OS: ubuntu-latest - # FEATURES: ring-cipher,openssl-vendored,wss + - TARGET: i686-unknown-linux-musl + OS: ubuntu-latest + FEATURES: ring-cipher,openssl-vendored,wss - TARGET: x86_64-unknown-linux-musl OS: ubuntu-latest FEATURES: ring-cipher,wss @@ -267,4 +267,4 @@ jobs: file: ./artifacts/**/*.tar.gz tag: ${{ github.ref }} overwrite: true - file_glob: true \ No newline at end of file + file_glob: true