Merge pull request #13 from portier/feat/update

Update dependencies
portier · Nov 14, 2023 · 592bbca · 592bbca
2 parents 4a0ca54 + 7af02c9
commit 592bbca
Show file tree

Hide file tree

Showing 7 changed files with 484 additions and 579 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,72 +7,54 @@ on:
     branches: [main]
 
 jobs:
-  toolchain-compat:
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Install Rust
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: '1.60.0'
-        profile: minimal
-        default: true
-
-    - name: Cache
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.cargo/registry
-          ~/.cargo/git
-          target
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-    - name: Check
-      run: cargo check --locked
-
   linux-build:
     runs-on: ubuntu-latest
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Install Rust
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        profile: minimal
-        components: rustfmt, clippy
-        default: true
+      run: |
+        rustup update --no-self-update stable
+        rustup component add --toolchain stable rustfmt clippy
+        rustup default stable
 
     - name: Rustfmt
       run: cargo fmt -- --check
 
     - name: Cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: |
-          ~/.cargo/registry
-          ~/.cargo/git
-          target
+          ~/.cargo/bin/
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+          target/
         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
+    - name: Clippy
+      run: cargo clippy --locked
+
     - name: Build
-      run: cargo build --locked --workspace
+      run: cargo build --locked
 
-    - name: Clippy
-      uses: actions-rs/clippy-check@v1
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Build examples
+      run: cargo build --locked --examples
 
     - name: Build tester
       run: go install github.com/portier/client-tester@latest
 
     - name: Run test suite
-      run: ~/go/bin/client-tester -bin ./target/debug/portier-tester
+      run: ~/go/bin/client-tester -bin ./target/debug/examples/tester
 
     - name: Check - no features
       run: cargo build --locked --no-default-features
+
+    - name: Check - toolchain compat
+      env:
+        toolchain_version: 1.63.0
+      run: |
+        rustup update --no-self-update $toolchain_version
+        cargo +$toolchain_version check --locked