diff --git a/.github/install-dep/action.yml b/.github/install-dep/action.yml index 7f6ed4837..fc9adbc92 100644 --- a/.github/install-dep/action.yml +++ b/.github/install-dep/action.yml @@ -41,17 +41,16 @@ runs: shell: bash run: | echo "$HOME/.cargo/bin" >> $GITHUB_PATH - - # 检查并安装缺失的包 + PACKAGES="cmake git git-lfs build-essential pkg-config curl wget file libssl-dev libayatana-appindicator3-dev librsvg2-dev libgtk-4-dev libadwaita-1-0 libadwaita-1-dev libgtksourceview-5-dev libwebkit2gtk-4.1-dev fuse3 libfuse3-dev" MISSING_PACKAGES="" - + for pkg in $PACKAGES; do if ! dpkg -l | grep -q "^ii $pkg "; then MISSING_PACKAGES="$MISSING_PACKAGES $pkg" fi done - + if [ -n "$MISSING_PACKAGES" ]; then echo "Installing missing packages: $MISSING_PACKAGES" sudo apt update @@ -59,10 +58,9 @@ runs: else echo "All required packages are already installed" fi - - # 创建用户缓存目录 + mkdir -p ~/.cache/apt-archives - + sudo apt update sudo apt install -y \ cmake \ @@ -85,14 +83,13 @@ runs: libfuse3-dev # ================ Platform-specific Initialization (macOS) ================ - # macOS - 不使用缓存,直接安装 - name: Install dependencies (macOS) if: contains(inputs.platform, 'macos') shell: bash run: | echo CMAKE_POLICY_VERSION_MINIMUM=3.10 >> $GITHUB_ENV echo "$HOME/.cargo/bin" >> $GITHUB_PATH - + brew install \ gtk4 \ libadwaita \ @@ -100,7 +97,6 @@ runs: gtksourceview5 # =============== Platform-specific Initialization (Windows) =============== - # Windows - 不使用缓存,直接安装 - name: Install dependencies (Windows) if: contains(inputs.platform, 'windows') shell: powershell diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml index 1fd073c2f..ad8cf507b 100644 --- a/.github/workflows/base.yml +++ b/.github/workflows/base.yml @@ -64,8 +64,8 @@ jobs: runs-on: [self-hosted, macOS, ARM64] home: "/Users/eli" - os: windows - runs-on: [self-hosted, X64, Windows] - home: "C:\\Users\\meagl" + runs-on: windows-latest + home: "C:\\Users\\runneradmin" runs-on: ${{ matrix.runs-on }} env: @@ -104,7 +104,7 @@ jobs: cargo test --manifest-path vault/Cargo.toml --all-features --no-fail-fast -- --nocapture cargo test --manifest-path saturn/Cargo.toml --all-features --no-fail-fast -- --nocapture cargo test --manifest-path libra/Cargo.toml --all-features --no-fail-fast -- --nocapture - + monobean: name: Test Monobean for ${{ matrix.os }} strategy: @@ -120,9 +120,9 @@ jobs: self-hosted: true home: "/Users/eli" - os: windows - runs-on: [self-hosted, X64, Windows] + runs-on: windows-latest self-hosted: true - home: "C:\\Users\\meagl" + home: "C:\\Users\\runneradmin" runs-on: ${{ matrix.runs-on }} env: @@ -156,4 +156,4 @@ jobs: steps: - uses: actions/checkout@v4 - uses: actions-rust-lang/setup-rust-toolchain@v1 - - run: cargo clippy --manifest-path scorpio/Cargo.toml --all-targets --all-features -- -D warnings \ No newline at end of file + - run: cargo clippy --manifest-path scorpio/Cargo.toml --all-targets --all-features -- -D warnings