From 946fd2ddb0c41ce1b70809c996ef34036361bddc Mon Sep 17 00:00:00 2001
From: zonyitoo <zonyitoo@gmail.com>
Date: Thu, 28 Nov 2024 22:52:46 +0800
Subject: [PATCH] fix(ci): service msrv 1.80, rust msrv 1.80, lib msrv 1.75

---
 .github/workflows/build-msrv.yml      | 54 +++++++++++++++++++++++++--
 Cargo.toml                            |  2 +-
 crates/shadowsocks-service/Cargo.toml |  2 +-
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-msrv.yml b/.github/workflows/build-msrv.yml
index c0e4808c7cf4..db88aa874c64 100644
--- a/.github/workflows/build-msrv.yml
+++ b/.github/workflows/build-msrv.yml
@@ -11,7 +11,7 @@ env:
   RUST_LOG: "trace"
 
 jobs:
-  buid-test-check:
+  shadowsocks-rust:
     strategy:
       matrix:
         platform:
@@ -28,12 +28,58 @@ jobs:
       - name: Install Rust
         run: |
           rustup set profile minimal
-          rustup toolchain install 1.75
-          rustup default 1.75
-          rustup override set 1.75
+          rustup toolchain install 1.80
+          rustup default 1.80
+          rustup override set 1.80
       - name: Build with All Features Enabled (Unix)
         if: ${{ runner.os == 'Linux' || runner.os == 'macOS' }}
         run: cargo build --verbose --features "full-extra local-flow-stat utility-url-outline"
       - name: Build with All Features Enabled (Windows)
         if: ${{ runner.os == 'Windows' }}
         run: cargo build --verbose --features "full-extra local-flow-stat utility-url-outline winservice"
+
+  shadowsocks-service:
+    strategy:
+      matrix:
+        platform:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
+    runs-on: ${{ matrix.platform }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Swatinem/rust-cache@v2
+      - if: ${{ runner.os == 'Windows' }}
+        uses: ilammy/setup-nasm@v1
+      - name: Install Rust
+        run: |
+          rustup set profile minimal
+          rustup toolchain install 1.80
+          rustup default 1.80
+          rustup override set 1.80
+      - name: Build with All Features Enabled
+        run: cargo build --manifest-path crates/shadowsocks-service/Cargo.toml --verbose --features "full dns-over-tls dns-over-https dns-over-h3 local-dns local-flow-stat local-http-rustls local-tun local-fake-dns local-online-config stream-cipher aead-cipher-extra aead-cipher-2022 aead-cipher-2022-extra security-replay-attack-detect"
+
+  shadowsocks:
+    strategy:
+      matrix:
+        platform:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
+    runs-on: ${{ matrix.platform }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Swatinem/rust-cache@v2
+      - if: ${{ runner.os == 'Windows' }}
+        uses: ilammy/setup-nasm@v1
+      - name: Install Rust
+        run: |
+          rustup set profile minimal
+          rustup toolchain install 1.75
+          rustup default 1.75
+          rustup override set 1.75
+      - name: Build with All Features Enabled
+        run: cargo build --manifest-path crates/shadowsocks/Cargo.toml --verbose --features "stream-cipher aead-cipher-extra aead-cipher-2022 aead-cipher-2022-extra security-replay-attack-detect"
diff --git a/Cargo.toml b/Cargo.toml
index d353f2ade57b..6877369354bb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ documentation = "https://docs.rs/shadowsocks-rust"
 keywords = ["shadowsocks", "proxy", "socks", "socks5", "firewall"]
 license = "MIT"
 edition = "2021"
-rust-version = "1.75"
+rust-version = "1.80"
 
 [badges]
 maintenance = { status = "passively-maintained" }
diff --git a/crates/shadowsocks-service/Cargo.toml b/crates/shadowsocks-service/Cargo.toml
index 18a5fe38d0ad..714521441e05 100644
--- a/crates/shadowsocks-service/Cargo.toml
+++ b/crates/shadowsocks-service/Cargo.toml
@@ -9,7 +9,7 @@ documentation = "https://docs.rs/shadowsocks-service"
 keywords = ["shadowsocks", "proxy", "socks", "socks5", "firewall"]
 license = "MIT"
 edition = "2021"
-rust-version = "1.75"
+rust-version = "1.80"
 
 [badges]
 maintenance = { status = "passively-maintained" }