ci: Update actions and release targets

magic-wormhole · Jul 17, 2024 · 271d157 · 271d157
1 parent c079dde
commit 271d157
Show file tree

Hide file tree

Showing 4 changed files with 116 additions and 127 deletions.
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -2,33 +2,31 @@ name: Security Audit
 
 on:
   push:
-    branches: [ master ]
+    branches: [main]
     paths:
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
+      - "**/Cargo.toml"
+      - "**/Cargo.lock"
   pull_request:
-    branches: [ master ]
+    branches: [main]
     paths:
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
+      - "**/Cargo.toml"
+      - "**/Cargo.lock"
   schedule:
-    - cron: '32 10 * * *'
+    - cron: "32 10 * * *"
 
 jobs:
   audit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: Cache ~/.cargo
-      uses: actions/cache@v1
-      with:
-        # we specifically want ~/.cargo/bin/cargo-audit
-        # and ~/.cargo/.crates.toml and .crates2.json
-        # which cargo-install uses to remember that it's
-        # already installed
-        path: ~/.cargo
-        key: ${{ runner.os }}-audit-dotcargo
-    - uses: actions-rs/audit-check@v1
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-
+      - uses: actions/checkout@v4
+      - name: Cache ~/.cargo
+        uses: actions/cache@v4
+        with:
+          # we specifically want ~/.cargo/bin/cargo-audit
+          # and ~/.cargo/.crates.toml and .crates2.json
+          # which cargo-install uses to remember that it's
+          # already installed
+          path: ~/.cargo
+          key: ${{ runner.os }}-audit-dotcargo
+      - uses: actions-rust-lang/audit@v1
+        name: Audit Rust Dependencies
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -2,214 +2,206 @@ name: Rust
 
 on:
   push:
-    branches: [master, dev]
+    branches: [main, dev]
   pull_request:
-    branches: [master, dev]
+    branches: [main, dev]
 
 jobs:
-  format:
-    name: cargo fmt (nightly)
+  read_msrv:
+    name: Read MSRV
+    uses: actions-rust-lang/msrv/.github/workflows/msrv.yml@main
+
+  formatting:
+    name: cargo fmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      # Ensure rustfmt is installed and setup problem matcher
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly
-          override: true
           components: rustfmt
-          profile: minimal
-      - name: Format
-        run: cargo fmt -- --check
+          toolchain: nightly
+      - name: Rustfmt Check
+        uses: actions-rust-lang/rustfmt@v1
 
   clippy:
     name: clippy (stable)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Cache ~/.cargo
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.cargo
           key: ${{ runner.os }}-clippy-dotcargo
       - name: Cache cargo build
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: target
           key: ${{ runner.os }}-clippy-cargo-build-target
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
           components: clippy
-          override: true
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-features
-          name: clippy results
+      - name: cargo clippy
+        run: cargo clippy --all-features
 
   test:
-    runs-on: ${{ matrix.os }}
+    name: "test (${{ matrix.os }} ${{ matrix.channel }})"
+    needs:
+      - read_msrv
+    runs-on: ${{ matrix.image }}
     strategy:
       fail-fast: false
       matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
-          - macos-latest
-        rust:
-          - 1.75 # MSRV (also change in Cargo.toml)
+        channel:
+          - MSRV
           - stable
           - nightly
+        os:
+          - Linux
+          - Windows
+          - macOS
+        include:
+          - os: Linux
+            image: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+          - os: Windows
+            image: windows-latest
+            target: x86_64-pc-windows-msvc
+          - os: macOS
+            image: macos-latest
+            target: aarch64-apple-darwin
+          - channel: msrv
+            rust: ${{ needs.read_msrv.outputs.msrv }}
+          - channel: stable
+            rust: stable
+          - channel: nightly
+            rust: nightly
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
-          override: true
           target: wasm32-unknown-unknown
       - name: Cache ~/.cargo
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.cargo
           key: ${{ runner.os }}-test-dotcargo-${{ matrix.rust }}
       - name: Cache cargo build
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: target
           key: ${{ runner.os }}-test-build-target-${{ matrix.rust }}
       - name: build library (no default features)
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: -p magic-wormhole --no-default-features
+        run: cargo build -p magic-wormhole --target ${{ matrix.target }} --no-default-features
       - name: build library (features=transit)
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: -p magic-wormhole --no-default-features --features=transit
+        run: cargo build -p magic-wormhole --target ${{ matrix.target }} --no-default-features --features=transit
       - name: build library (features=transfer)
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: -p magic-wormhole --no-default-features --features=transfer
+        run: cargo build -p magic-wormhole --target ${{ matrix.target }} --no-default-features --features=transfer
       - name: build library (features=forwarding)
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: -p magic-wormhole --no-default-features --features=forwarding
+        run: cargo build -p magic-wormhole --target ${{ matrix.target }} --no-default-features --features=forwarding
       - name: build CLI
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --all-targets
+        run: cargo build -p magic-wormhole-cli --target ${{ matrix.target }} --features=all
       - name: build WASM
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --target wasm32-unknown-unknown --no-default-features --package magic-wormhole --features transit --features transfer
+        run: cargo build -p magic-wormhole --target wasm32-unknown-unknown --no-default-features --features transit --features transfer
       - name: test
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --verbose --workspace --features=all,native-tls,experimental
+        run: cargo test --verbose --workspace --features=all,native-tls,experimental
 
   dist:
-    runs-on: ${{ matrix.os }}
+    name: "dist (${{ matrix.os }})"
+    runs-on: ${{ matrix.image }}
     strategy:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-latest
-          - windows-latest
-          - macos-latest
+          - Linux
+          - Windows
+          - macOS
+        include:
+          - os: Linux
+            image: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+          - os: Windows
+            image: windows-latest
+            target: x86_64-pc-windows-gnu
+          - os: macOS
+            image: macos-latest
+            target: aarch64-apple-darwin
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
           toolchain: stable
-          override: true
+          target: ${{ matrix.target }}
       - name: Cache ~/.cargo
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.cargo
           key: ${{ runner.os }}-test-dotcargo-stable
       - name: Cache cargo build
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: target
           key: ${{ runner.os }}-test-build-target-stable
       - name: Build
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --bins --locked --release
+        run: cargo build -p magic-wormhole-cli --target ${{ matrix.target }} --bins --locked --release
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: wormhole-${{ matrix.os }}-${{ github.sha }}
+          name: magic-wormhole-cli-${{ matrix.target }}
           path: |
-            ./target/release/wormhole-rs
-            ./target/release/wormhole-rs.exe
+            ./target/${{ matrix.target }}/release/wormhole-rs
+            ./target/${{ matrix.target }}/release/wormhole-rs.exe
           if-no-files-found: error
 
   coverage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: nightly
-          override: true
-      - uses: actions-rs/[email protected]
+      - uses: taiki-e/cache-cargo-install-action@v1
         with:
-          crate: cargo-tarpaulin
-          version: latest
+          tool: cargo-tarpaulin
       - name: Cache ~/.cargo
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.cargo
           key: ${{ runner.os }}-coverage-dotcargo
       - name: Cache cargo build
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: target
           key: ${{ runner.os }}-coverage-cargo-build-target
       - name: Run tarpaulin
-        uses: actions-rs/cargo@v1
-        with:
-          command: tarpaulin
-          args: --workspace --out Xml
+        run: cargo tarpaulin --workspace --out Xml
       - name: upload coverage
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
   cargo-deny:
     name: Cargo deny
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: nightly
-          override: true
       - name: Checkout Rust toolcnain
-        uses: actions/checkout@v2
-        with:
-          toolchain: stable
-          override: true
+        uses: actions/checkout@v4
       - uses: EmbarkStudios/cargo-deny-action@v1
 
   semver:
     name: semver
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: nightly
-          override: true
       - name: Check semver
         uses: obi1kenobi/cargo-semver-checks-action@v2
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,10 +12,9 @@ authors = [
 description = "Get things from one computer to another, safely"
 keywords = ["magic-wormhole", "wormhole", "file-transfer", "transfer"]
 homepage = "http://magic-wormhole.io/"
-repository = "https://github.com/magic-wormhole/magic-wormhole.rs"
+repository = "https://github.com/magic-wormhole/magic-wormhole.rs/tree/main/cli"
 license = "EUPL-1.2"
 
-# MSRV (also change in CI)
 rust-version = "1.75"
 edition = "2021"
 

diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ This work is licensed under the EUPL v1.2 or later. Contact the owner(s) for use
 [build-status-image]: https://github.com/magic-wormhole/magic-wormhole.rs/workflows/Rust/badge.svg
 [deps-status-image]: https://deps.rs/repo/github/magic-wormhole/magic-wormhole.rs/status.svg
 [deps-status-url]: https://deps.rs/repo/github/magic-wormhole/magic-wormhole.rs
-[codecov-image]: https://codecov.io/gh/magic-wormhole/magic-wormhole.rs/branch/master/graph/badge.svg
+[codecov-image]: https://codecov.io/gh/magic-wormhole/magic-wormhole.rs/branch/main/graph/badge.svg
 [codecov-url]: https://codecov.io/gh/magic-wormhole/magic-wormhole.rs
 [crates-io-image]: https://img.shields.io/crates/v/magic-wormhole.svg
 [crates-io-url]: https://crates.io/crates/magic-wormhole