修改rust.yml文件，云编译通过

2025-09-26 20:21:20 +08:00 · 2025-09-17 08:41:44 +08:00
parent 1cba257531
commit affe8fb719
2 changed files with 157 additions and 119 deletions
--- 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 <<EOF
          [target.x86_64-unknown-linux-musl]
          rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols"]
@@ -209,29 +200,30 @@ jobs:
          linker = "i686-linux-musl-gcc"
          rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols"]   
          EOF
+
      - name: Install rust target
-        if: ${{ ! startsWith(matrix.TARGET, 'mips') }}
+        if: ${{ ! endsWith(matrix.TARGET, 'freebsd') &&  ! startsWith(matrix.TARGET, 'mips') }}
        run: rustup target add $TARGET
+
      - name: Run build vn-link-cli
        run: |
          if [[ $TARGET =~ ^mips.*$ ]]; then
-            cargo +nightly build --package vn-link-cli --release --verbose --target $TARGET -Z build-std=std,panic_abort --features $FEATURES
+            cargo +nightly build --package vn-link-cli --release --target $TARGET -Z build-std=std,panic_abort --features $FEATURES
          else
-            cargo build --package vn-link-cli --release --verbose --target $TARGET --features $FEATURES
+            cargo build --package vn-link-cli --release --target $TARGET --features $FEATURES
          fi
+
      - name: Run build vnt-cli
        run: |
          if [[ $TARGET =~ ^mips.*$ ]]; then
-            cargo +nightly build --package vnt-cli --release --verbose --target $TARGET -Z build-std=std,panic_abort --features $FEATURES
+            cargo +nightly build --package vnt-cli --release --target $TARGET -Z build-std=std,panic_abort --features $FEATURES
          else
-            cargo build --package vnt-cli --release --verbose --target $TARGET --features $FEATURES
+            cargo build --package vnt-cli --release --target $TARGET --features $FEATURES
          fi
-      - name: List target
-        run: find ./target
-      - name: Compress
+
+      - name: Compress artifacts
        run: |
          mkdir -p ./artifacts
-          # windows is the only OS using a different convention for executable file name
          if [[ $OS =~ ^windows.*$ ]]; then
              EXEC_VNT_CLI=vnt-cli.exe
              EXEC_VN_LINK_CLI=vn-link-cli.exe
@@ -251,13 +243,13 @@ jobs:
          tar -czf vnt-$TARGET-$TAG.tar.gz *
          mkdir upload_file
          mv vnt-$TARGET-$TAG.tar.gz ./upload_file/
+
      - name: Archive artifact
        uses: actions/upload-artifact@v4
        with:
          name: vnt-cli-${{ matrix.TARGET }}
-          path: |
-            ./artifacts/upload_file
-  # deploys to github releases on tag
+          path: ./artifacts/upload_file
+
  deploy:
    if: startsWith(github.ref, 'refs/tags/')
    needs: build
@@ -267,8 +259,7 @@ jobs:
        uses: actions/download-artifact@v4
        with:
          path: ./artifacts
-      - name: List
-        run: find ./artifacts
+
      - name: Release
        uses: svenstaro/upload-release-action@v2
        with:
@@ -276,4 +267,4 @@ jobs:
          file: ./artifacts/**/*.tar.gz
          tag: ${{ github.ref }}
          overwrite: true
-          file_glob: true
+          file_glob: true
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4

 [[package]]
 name = "addr2line"
@@ -760,6 +760,22 @@ dependencies = [
 "itoa",
 ]

+[[package]]
+name = "http_req"
+version = "0.13.1"
+source = "git+https://github.com/lmq8267/http_req.git#811fad9ba6df1a1f133f1388cb0450d75d71c000"
+dependencies = [
+ "base64",
+ "rand",
+ "rustls",
+ "rustls-pemfile",
+ "rustls-pki-types",
+ "unicase",
+ "webpki",
+ "webpki-roots",
+ "zeroize",
+]
+
 [[package]]
 name = "httparse"
 version = "1.9.4"
@@ -2142,6 +2158,12 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"

+[[package]]
+name = "unicase"
+version = "2.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.15"
@@ -2280,6 +2302,7 @@ dependencies = [
 "ecb",
 "fnv",
 "futures-util",
+ "http_req",
 "igd",
 "libc",
 "libloading",
@@ -2386,6 +2409,16 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"

+[[package]]
+name = "webpki"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "0.26.3"
@@ -2637,6 +2670,20 @@ name = "zeroize"
 version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.93",
+]

 [[package]]
 name = "zstd"