From 38f4449687549ab1a14e679537bd36cc99ac58ad Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Tue, 15 Feb 2022 09:26:21 +0200 Subject: [PATCH 1/7] wip --- .github/workflows/ci.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56d5a2bd43..c4ec59b600 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -180,7 +180,7 @@ jobs: args: --release --all-targets test: name: test - needs: build + # needs: build runs-on: ubuntu-18.04 steps: - name: checkout @@ -220,8 +220,13 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: ${{ env.toolchain }} - - name: cargo test + - name: Install cargo-nextest + uses: baptiste0928/cargo-install@v1 + with: + crate: cargo-nextest + version: 0.9 + - name: cargo nextest uses: actions-rs/cargo@v1 with: - command: test - args: --release --all-targets + command: nextest + args: run --release --all-targets From 503b123cb6fca1fd087c1a53a016fc76203b1316 Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Tue, 15 Feb 2022 11:43:22 +0200 Subject: [PATCH 2/7] wip --- .github/workflows/ci.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4ec59b600..0c105e6df9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,7 +80,7 @@ jobs: command: clippy args: --all-targets -- -D warnings build: - name: check nightly + name: build nightly runs-on: ubuntu-18.04 steps: - name: checkout @@ -125,7 +125,7 @@ jobs: - name: cargo check uses: actions-rs/cargo@v1 with: - command: check + command: build args: --release --all-targets build-stable: name: check stable @@ -180,7 +180,7 @@ jobs: args: --release --all-targets test: name: test - # needs: build + needs: build runs-on: ubuntu-18.04 steps: - name: checkout @@ -220,13 +220,8 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: ${{ env.toolchain }} - - name: Install cargo-nextest - uses: baptiste0928/cargo-install@v1 - with: - crate: cargo-nextest - version: 0.9 - - name: cargo nextest + - name: cargo test uses: actions-rs/cargo@v1 with: - command: nextest - args: run --release --all-targets + command: test + args: --release --all-targets From 06d466e717ed180404c6a434c3d73b958f2c981f Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Tue, 15 Feb 2022 13:09:43 +0200 Subject: [PATCH 3/7] wipit --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0c105e6df9..1e40c618b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,13 +120,13 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: ${{ env.toolchain }} - components: clippy, rustfmt + profile: minimal override: true - - name: cargo check + - name: cargo build uses: actions-rs/cargo@v1 with: command: build - args: --release --all-targets + args: --release build-stable: name: check stable runs-on: ubuntu-18.04 @@ -224,4 +224,4 @@ jobs: uses: actions-rs/cargo@v1 with: command: test - args: --release --all-targets + args: --release From 98a81af8b2441cae4f6ff65e37b69fdb9de36af7 Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Wed, 16 Feb 2022 09:32:44 +0200 Subject: [PATCH 4/7] rustcache --- .github/workflows/ci.yml | 84 +++++++++++----------------------------- 1 file changed, 22 insertions(+), 62 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1e40c618b8..042dcc1607 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,17 +24,13 @@ jobs: steps: - name: checkout uses: actions/checkout@v2 - - name: caching - uses: actions/cache@v2 + - name: toolchain + uses: actions-rs/toolchain@v1 with: - path: | - ~/.cargo/registry - ~/.cargo/git - target - key: ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-clippy-${{ hashFiles('**/Cargo.lock') }} - restore-keys: | - ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-clippy- - ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}- + toolchain: ${{ env.toolchain }} + components: clippy, rustfmt + override: true + - uses: Swatinem/rust-cache@v1 - name: ubuntu dependencies run: | sudo apt-get update && \ @@ -63,12 +59,6 @@ jobs: cd applications/launchpad/gui-vue npm ci npm run build - - name: toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ env.toolchain }} - components: clippy, rustfmt - override: true - name: cargo fmt uses: actions-rs/cargo@v1 with: @@ -85,17 +75,13 @@ jobs: steps: - name: checkout uses: actions/checkout@v2 - - name: caching - uses: actions/cache@v2 + - name: toolchain + uses: actions-rs/toolchain@v1 with: - path: | - ~/.cargo/registry - ~/.cargo/git - target - key: ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-build-${{ hashFiles('**/Cargo.lock') }} - restore-keys: | - ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-build- - ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}- + toolchain: ${{ env.toolchain }} + profile: minimal + override: true + - uses: Swatinem/rust-cache@v1 - name: ubuntu dependencies run: | sudo apt-get update && \ @@ -116,12 +102,6 @@ jobs: cd applications/launchpad/gui-vue npm ci npm run build - - name: toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ env.toolchain }} - profile: minimal - override: true - name: cargo build uses: actions-rs/cargo@v1 with: @@ -133,17 +113,13 @@ jobs: steps: - name: checkout uses: actions/checkout@v2 - - name: caching - uses: actions/cache@v2 + - name: toolchain + uses: actions-rs/toolchain@v1 with: - path: | - ~/.cargo/registry - ~/.cargo/git - target - key: ${{ runner.os }}-${{ runner.cpu-model }}-stable-build-${{ hashFiles('**/Cargo.lock') }} - restore-keys: | - ${{ runner.os }}-${{ runner.cpu-model }}-stable-build- - ${{ runner.os }}-${{ runner.cpu-model }}-stable- + toolchain: stable + profile: minimal + override: true + - uses: Swatinem/rust-cache@v1 - name: ubuntu dependencies run: | sudo apt-get update && \ @@ -164,12 +140,6 @@ jobs: cd applications/launchpad/gui-vue npm ci npm run build - - name: toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - profile: minimal - override: true - name: rustup show run: | rustup show @@ -185,17 +155,11 @@ jobs: steps: - name: checkout uses: actions/checkout@v2 - - name: caching - uses: actions/cache@v2 + - name: toolchain + uses: actions-rs/toolchain@v1 with: - path: | - ~/.cargo/registry - ~/.cargo/git - target - key: ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-test-${{ hashFiles('**/Cargo.lock') }} - restore-keys: | - ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-test- - ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}- + toolchain: ${{ env.toolchain }} + - uses: Swatinem/rust-cache@v1 - name: ubuntu dependencies run: | sudo apt-get update && \ @@ -216,10 +180,6 @@ jobs: cd applications/launchpad/gui-vue npm ci npm run build - - name: toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ env.toolchain }} - name: cargo test uses: actions-rs/cargo@v1 with: From 3c565a6ab3f7a8d8794acaecf9fd6e5744e4d751 Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Wed, 16 Feb 2022 09:33:24 +0200 Subject: [PATCH 5/7] nodep --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 042dcc1607..51840be2ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -150,7 +150,7 @@ jobs: args: --release --all-targets test: name: test - needs: build + # needs: build runs-on: ubuntu-18.04 steps: - name: checkout From f0ca09f5d8c2dff04d1ef27ec256dddb4045fb60 Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Wed, 16 Feb 2022 09:51:33 +0200 Subject: [PATCH 6/7] suggestions --- .github/workflows/ci.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 51840be2ac..588f1f65fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,7 +70,7 @@ jobs: command: clippy args: --all-targets -- -D warnings build: - name: build nightly + name: check nightly runs-on: ubuntu-18.04 steps: - name: checkout @@ -102,11 +102,11 @@ jobs: cd applications/launchpad/gui-vue npm ci npm run build - - name: cargo build + - name: cargo check uses: actions-rs/cargo@v1 with: - command: build - args: --release + command: check + args: --release --all-targets build-stable: name: check stable runs-on: ubuntu-18.04 @@ -180,8 +180,13 @@ jobs: cd applications/launchpad/gui-vue npm ci npm run build + - name: cargo test compile + uses: actions-rs/cargo@v1 + with: + command: test + args: --no-run --locked - name: cargo test uses: actions-rs/cargo@v1 with: command: test - args: --release + args: --nocapture From 0961e0a7b492261bba7c62b6345ec0e71033fd09 Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Wed, 16 Feb 2022 12:08:11 +0200 Subject: [PATCH 7/7] Update ci.yml --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 588f1f65fc..ce9f7f6626 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -189,4 +189,3 @@ jobs: uses: actions-rs/cargo@v1 with: command: test - args: --nocapture