From 73542cc50054d40fcd2604748374e5b9469ce39e Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Mon, 2 Sep 2024 11:43:37 +0300 Subject: [PATCH 1/7] ci: Get "install rust" action from neqo --- .github/workflows/check.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 7017e8e..3284bce 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -37,8 +37,14 @@ jobs: - name: Checkout uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - name: Get "Install Rust" action + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + with: + repository: mozilla/neqo + path: .github/actions + - name: Install Rust - uses: mozilla/neqo/.github/actions/rust + uses: ./.github/actions/rust with: version: ${{ matrix.rust-toolchain }} components: rustfmt, clippy, llvm-tools-preview From 9b8facaf1ea99d074ffb8f2616b1931c31188a88 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Mon, 2 Sep 2024 11:46:25 +0300 Subject: [PATCH 2/7] ci: Fix CI --- .github/workflows/check.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 3284bce..ca51d71 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -41,7 +41,10 @@ jobs: uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: repository: mozilla/neqo - path: .github/actions + sparse-checkout: | + .github/actions/rust + + - run: find . -ls - name: Install Rust uses: ./.github/actions/rust From d32c80e703f7f68455d848355b73971d6759533b Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Mon, 2 Sep 2024 11:49:12 +0300 Subject: [PATCH 3/7] Path --- .github/workflows/check.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index ca51d71..a546d48 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -43,11 +43,12 @@ jobs: repository: mozilla/neqo sparse-checkout: | .github/actions/rust + path: neqo - run: find . -ls - name: Install Rust - uses: ./.github/actions/rust + uses: neqo/.github/actions/rust with: version: ${{ matrix.rust-toolchain }} components: rustfmt, clippy, llvm-tools-preview From cd6658ba09c5c9bcc26bb46cf339b51df5a4b61b Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Mon, 2 Sep 2024 11:50:30 +0300 Subject: [PATCH 4/7] Path --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index a546d48..bdd7468 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -48,7 +48,7 @@ jobs: - run: find . -ls - name: Install Rust - uses: neqo/.github/actions/rust + uses: ./neqo/.github/actions/rust with: version: ${{ matrix.rust-toolchain }} components: rustfmt, clippy, llvm-tools-preview From e1a311df0a8491096af3312d34bf15593bbc7774 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Mon, 2 Sep 2024 11:54:36 +0300 Subject: [PATCH 5/7] More --- .github/workflows/check.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index bdd7468..2a1c182 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -25,7 +25,11 @@ jobs: os: [ubuntu-latest, macos-14, windows-latest] # Keep low end in sync with Cargo.toml rust-toolchain: [1.76.0, stable, nightly] - type: [debug, release] + type: [debug] + include: + - os: [ubuntu-latest, macos-14, windows-latest] + rust-toolchain: stable + type: release env: BUILD_TYPE: ${{ matrix.type == 'release' && '--release' || '' }} runs-on: ${{ matrix.os }} @@ -37,7 +41,7 @@ jobs: - name: Checkout uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - name: Get "Install Rust" action + - name: Get "Install Rust" action from neqo uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: repository: mozilla/neqo @@ -45,8 +49,6 @@ jobs: .github/actions/rust path: neqo - - run: find . -ls - - name: Install Rust uses: ./neqo/.github/actions/rust with: @@ -64,7 +66,7 @@ jobs: run: | # shellcheck disable=SC2086 RUST_LOG=trace cargo +${{ matrix.rust-toolchain }} llvm-cov nextest $BUILD_TYPE --no-fail-fast --lcov --output-path lcov.info - cargo +${{ matrix.rust-toolchain }} bench --features bench --no-run + cargo +${{ matrix.rust-toolchain }} bench --no-run - name: Check formatting run: | @@ -82,7 +84,7 @@ jobs: - name: Clippy run: | - cargo +${{ matrix.rust-toolchain }} hack clippy --all-targets --feature-powerset --exclude-features gecko -- -D warnings || ${{ matrix.rust-toolchain == 'nightly' }} + cargo +${{ matrix.rust-toolchain }} hack clippy --all-targets --feature-powerset -- -D warnings || ${{ matrix.rust-toolchain == 'nightly' }} if: success() || failure() - name: Check rustdoc links From 1e10104506e8b2d90b30780d162db36931454980 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Mon, 2 Sep 2024 11:59:12 +0300 Subject: [PATCH 6/7] Matrix --- .github/workflows/check.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 2a1c182..18e08a0 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -18,7 +18,7 @@ permissions: jobs: check: - name: Build & test + name: Check strategy: fail-fast: false matrix: @@ -27,8 +27,7 @@ jobs: rust-toolchain: [1.76.0, stable, nightly] type: [debug] include: - - os: [ubuntu-latest, macos-14, windows-latest] - rust-toolchain: stable + - rust-toolchain: stable type: release env: BUILD_TYPE: ${{ matrix.type == 'release' && '--release' || '' }} From f8a41d4a41b2a29a7e4a3c918f5351500cce6ed6 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Mon, 2 Sep 2024 12:01:06 +0300 Subject: [PATCH 7/7] Matrix --- .github/workflows/check.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 18e08a0..30d5483 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -27,7 +27,14 @@ jobs: rust-toolchain: [1.76.0, stable, nightly] type: [debug] include: - - rust-toolchain: stable + - os: ubuntu-latest + rust-toolchain: stable + type: release + - os: macos-14 + rust-toolchain: stable + type: release + - os: windows-latest + rust-toolchain: stable type: release env: BUILD_TYPE: ${{ matrix.type == 'release' && '--release' || '' }}