diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml deleted file mode 100644 index 9bb449e..0000000 --- a/.github/workflows/check.yml +++ /dev/null @@ -1,92 +0,0 @@ -# Borrowed from https://github.com/jonhoo/rust-ci-conf/blob/6332a3af21a58f811a681a98cd44d0f5da8a1891/.github/workflows/check.yml -# See the [screencast] by Jon Gjengset. -# -# [screencast]: https://www.youtube.com/watch?v=xUH-4y92jPg - -name: check - -permissions: - contents: read - -on: - push: - branches: [main] - pull_request: - -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true - -jobs: - fmt: - name: stable / fmt - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - name: Install stable - uses: dtolnay/rust-toolchain@stable - with: - components: rustfmt - - name: cargo fmt --check --all - run: cargo fmt --check --all - working-directory: rust/ - - clippy: - name: ${{ matrix.toolchain }} / clippy - runs-on: ubuntu-latest - permissions: - contents: read - checks: write - strategy: - fail-fast: false - matrix: - toolchain: [stable, beta] - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - name: Install ${{ matrix.toolchain }} - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ matrix.toolchain }} - components: clippy - - name: cargo clippy - uses: actions-rs/clippy-check@v1 - with: - # Github Actions don't support `working-dir` in the `uses` context. - # Specify `--manifest-path` as a workaround. - # - # See https://github.com/actions-rs/clippy-check/issues/28 - args: --all-features --workspace --manifest-path rust/Cargo.toml - token: ${{ secrets.GITHUB_TOKEN }} - - doc: - name: nightly / doc - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - name: Install nightly - uses: dtolnay/rust-toolchain@nightly - - name: cargo doc - run: cargo doc --no-deps --all-features --document-private-items --workspace - working-directory: rust/ - - hack: - name: ubuntu / stable / features - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - name: Install stable - uses: dtolnay/rust-toolchain@stable - - name: cargo install cargo-hack - uses: taiki-e/install-action@cargo-hack - # Intentionally no target specifier; see https://github.com/jonhoo/rust-ci-conf/pull/4 - - name: cargo hack - run: cargo hack --feature-powerset --workspace check - working-directory: rust/ diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d7ed5e8..39aeb95 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - toolchain: [stable, beta] + toolchain: [stable] + #XXX toolchain: [stable, beta] steps: - uses: actions/checkout@v4 with: @@ -32,6 +33,15 @@ jobs: uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.toolchain }} + - name: Install the latest stable `tshark` + # See https://launchpad.net/~wireshark-dev/+archive/ubuntu/stable + run: | + sudo apt update + sudo apt -y install software-properties-common # provides `add-apt-repository` + sudo add-apt-repository --yes ppa:wireshark-dev/stable + sudo apt update + sudo apt -y install tshark + tshark --version - run: cargo generate-lockfile if: hashFiles('rust/Cargo.lock') == '' # https://twitter.com/jonhoo/status/1571290371124260865 @@ -42,44 +52,3 @@ jobs: - name: cargo test --doc run: cargo test --locked --all-features --doc --workspace working-directory: rust/ - - minimal: - name: ubuntu / stable / minimal-versions - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - name: Install stable - uses: dtolnay/rust-toolchain@stable - - name: Install nightly for -Zminimal-versions - uses: dtolnay/rust-toolchain@nightly - - run: rustup default stable - - run: cargo +nightly update -Zminimal-versions --workspace - working-directory: rust/ - - run: cargo test --locked --all-features --all-targets --workspace - working-directory: rust/ - - os-check: - name: ${{ matrix.os }} / stable - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: - # NOTE: Don't use GitHub-hosted macOS runners in a non-public repository -- - # they consume CI/CD minutes like crazy; see - # https://docs.github.com/en/billing/managing-billing-for-github-actions/about-billing-for-github-actions#minute-multipliers - - windows-latest - #- macos-latest - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - name: Install stable - uses: dtolnay/rust-toolchain@stable - - run: cargo generate-lockfile - if: hashFiles('rust/Cargo.lock') == '' - - name: cargo test - run: cargo test --locked --all-features --all-targets --workspace - working-directory: rust/