From 2415cb211efe0d3dcde48120c27a695d96bda336 Mon Sep 17 00:00:00 2001 From: "sijie.sun" Date: Sun, 4 Aug 2024 09:46:24 +0800 Subject: [PATCH] run on v7 need rustc < 1.78 --- .github/workflows/core.yml | 2 +- .github/workflows/gui.yml | 2 +- .github/workflows/install_rust.sh | 5 ++--- .github/workflows/mobile.yml | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index b442fb8..2de27bb 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -28,7 +28,7 @@ jobs: # All of these options are optional, so you can remove them if you are happy with the defaults concurrent_skipping: 'never' skip_after_successful_duplicate: 'true' - paths: '["Cargo.toml", "Cargo.lock", "easytier/**", ".github/workflows/core.yml"]' + paths: '["Cargo.toml", "Cargo.lock", "easytier/**", ".github/workflows/core.yml", ".github/workflows/install_rust.sh"]' build: strategy: fail-fast: false diff --git a/.github/workflows/gui.yml b/.github/workflows/gui.yml index 7578be8..e1496d9 100644 --- a/.github/workflows/gui.yml +++ b/.github/workflows/gui.yml @@ -28,7 +28,7 @@ jobs: # All of these options are optional, so you can remove them if you are happy with the defaults concurrent_skipping: 'never' skip_after_successful_duplicate: 'true' - paths: '["Cargo.toml", "Cargo.lock", "easytier/**", "easytier-gui/**", ".github/workflows/gui.yml"]' + paths: '["Cargo.toml", "Cargo.lock", "easytier/**", "easytier-gui/**", ".github/workflows/gui.yml", ".github/workflows/install_rust.sh"]' build-gui: strategy: fail-fast: false diff --git a/.github/workflows/install_rust.sh b/.github/workflows/install_rust.sh index d2120e4..c951ce7 100644 --- a/.github/workflows/install_rust.sh +++ b/.github/workflows/install_rust.sh @@ -57,8 +57,8 @@ fi # see https://github.com/rust-lang/rustup/issues/3709 rustup set auto-self-update disable -rustup install 1.79 -rustup default 1.79 +rustup install 1.77 +rustup default 1.77 # mips/mipsel cannot add target from rustup, need compile by ourselves if [[ $OS =~ ^ubuntu.*$ && $TARGET =~ ^mips.*$ ]]; then @@ -72,7 +72,6 @@ if [[ $OS =~ ^ubuntu.*$ && $TARGET =~ ^mips.*$ ]]; then rustup toolchain install nightly-x86_64-unknown-linux-gnu rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu - cd - else rustup target add $TARGET if [[ $GUI_TARGET != '' ]]; then diff --git a/.github/workflows/mobile.yml b/.github/workflows/mobile.yml index 3b285ca..9a669c7 100644 --- a/.github/workflows/mobile.yml +++ b/.github/workflows/mobile.yml @@ -28,7 +28,7 @@ jobs: # All of these options are optional, so you can remove them if you are happy with the defaults concurrent_skipping: 'never' skip_after_successful_duplicate: 'true' - paths: '["Cargo.toml", "Cargo.lock", "easytier/**", "easytier-gui/**", "tauri-plugin-vpnservice/**", ".github/workflows/mobile.yml"]' + paths: '["Cargo.toml", "Cargo.lock", "easytier/**", "easytier-gui/**", "tauri-plugin-vpnservice/**", ".github/workflows/mobile.yml", ".github/workflows/install_rust.sh"]' build-mobile: strategy: fail-fast: false