Merge branch 'main' into windows-support

pelikan-io · Sep 19, 2024 · 13c2cb8 · 13c2cb8
2 parents 2177d35 + de8c62d
commit 13c2cb8
Show file tree

Hide file tree

Showing 36 changed files with 2,420 additions and 589 deletions.
diff --git a/.github/actions/pingserver/action.yml b/.github/actions/pingserver/action.yml
@@ -41,6 +41,6 @@ runs:
       shell: bash
     - name: Run pingserver
       run: |
-        pelikan_pingserver_rs server.toml &
+        pelikan_pingserver server.toml &
         sleep 10
       shell: bash
diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: ./.github/actions/setup-rust
       - uses: Swatinem/rust-cache@v2
       - uses: swlynch99/cargo-sweep-action@v1
       - uses: taiki-e/install-action@cargo-hack
@@ -83,10 +83,11 @@ jobs:
         with:
           shared-key: check-ubuntu-latest
           save-if: false
-      - uses: baptiste0928/cargo-install@v1
+      - uses: baptiste0928/cargo-install@v3
         with:
           crate: cargo-audit
-          args: --locked
+          version: '0.21.0-pre.0'
+          locked: true
       - run: |
           cargo audit
         
@@ -95,7 +96,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: ./.github/actions/setup-rust
       - name: cargo fmt
         shell: bash
         run: |
@@ -145,7 +146,7 @@ jobs:
         shell: bash
         run: |
           mkdir install
-          cp target/release/pelikan_pingserver_rs install
+          cp target/release/pelikan_pingserver install
           cp target/release/pelikan_pingproxy_rs  install
       - uses: actions/upload-artifact@v3
         if: ${{ matrix.profile == 'release' && matrix.os == 'ubuntu-latest' }}