From 6f95aaee34f7f9bfd49a4ebabfdce8dff76e03c0 Mon Sep 17 00:00:00 2001 From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com> Date: Fri, 4 Nov 2022 04:48:44 -0400 Subject: [PATCH] ci: remove caching for release building (#866) * ci: remove caching for release building * standardize hyphen across some job names --- .github/workflows/build_releases.yml | 24 ------------------------ .github/workflows/ci.yml | 14 +++++++------- .github/workflows/coverage.yml | 6 +++--- .github/workflows/nightly.yml | 2 ++ .github/workflows/test-docs.yml | 6 +++--- 5 files changed, 15 insertions(+), 37 deletions(-) diff --git a/.github/workflows/build_releases.yml b/.github/workflows/build_releases.yml index 72c695ef..4492bee8 100644 --- a/.github/workflows/build_releases.yml +++ b/.github/workflows/build_releases.yml @@ -137,11 +137,6 @@ jobs: sh rustup.sh --default-toolchain stable -y echo "$HOME/.cargo/bin" >> $GITHUB_PATH - - name: Enable Rust cache - uses: Swatinem/rust-cache@22c9328bcba27aa81a32b1bef27c7e3c78052531 # 2.0.1 - with: - key: ${{ matrix.info.target }} - - name: Build uses: ClementTsang/cargo-action@v0.0.3 with: @@ -201,12 +196,6 @@ jobs: name: release path: release - # If I add more shared cleanup stuff in the future, I should move to a separate script, perhaps. - - name: Delete automatically generated completion/manpage to not cache - shell: bash - run: | - rm -r ./target/tmp/bottom/ - build-msi: name: "Build MSI installer" runs-on: "windows-2019" @@ -233,11 +222,6 @@ jobs: toolchain: stable target: x86_64-pc-windows-msvc - - name: Enable Rust cache - uses: Swatinem/rust-cache@22c9328bcba27aa81a32b1bef27c7e3c78052531 # 2.0.1 - with: - key: x86_64-pc-windows-msvc-msi - - name: Build MSI file shell: powershell run: | @@ -316,9 +300,6 @@ jobs: toolchain: stable target: ${{ matrix.info.target }} - - name: Enable Rust cache - uses: Swatinem/rust-cache@22c9328bcba27aa81a32b1bef27c7e3c78052531 # 2.0.1 - - name: Build uses: ClementTsang/cargo-action@v0.0.3 with: @@ -373,8 +354,3 @@ jobs: retention-days: 3 name: release path: release - - - name: Delete automatically generated completion/manpage to not cache - shell: bash - run: | - rm -r ./target/tmp/bottom/ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c338655..d2f1633c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ concurrency: jobs: # Check if things should be skipped. - pre_job: + pre-job: runs-on: ubuntu-latest outputs: should_skip: ${{ steps.skip_check.outputs.should_skip }} @@ -49,9 +49,9 @@ jobs: # Runs rustfmt + tests + clippy on the main supported platforms. supported: - needs: pre_job + needs: pre-job runs-on: ${{ matrix.info.os }} - if: ${{ needs.pre_job.outputs.should_skip != 'true' }} + if: ${{ needs.pre-job.outputs.should_skip != 'true' }} strategy: fail-fast: false matrix: @@ -121,10 +121,10 @@ jobs: RUST_BACKTRACE: full # Run cargo check on all other platforms - other_check: - needs: pre_job + other-check: + needs: pre-job runs-on: ${{ matrix.info.os }} - if: ${{ needs.pre_job.outputs.should_skip != 'true' }} + if: ${{ needs.pre-job.outputs.should_skip != 'true' }} continue-on-error: true strategy: fail-fast: false @@ -239,7 +239,7 @@ jobs: completion: name: "CI Pass Check" - needs: [supported, other_check] + needs: [supported, other-check] runs-on: "ubuntu-latest" steps: - name: CI Passed diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 5e4f85f5..10ce30fa 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -17,7 +17,7 @@ concurrency: cancel-in-progress: ${{ github.event_name == 'pull_request' || github.repository != 'ClementTsang/bottom' }} jobs: - pre_job: + pre-job: runs-on: ubuntu-latest outputs: should_skip: ${{ steps.skip_check.outputs.should_skip }} @@ -30,8 +30,8 @@ jobs: do_not_skip: '["workflow_dispatch", "push"]' coverage: - needs: pre_job - if: ${{ needs.pre_job.outputs.should_skip != 'true' }} + needs: pre-job + if: ${{ needs.pre-job.outputs.should_skip != 'true' }} runs-on: ubuntu-latest steps: - name: Checkout repository diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0384beba..356badf6 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -18,6 +18,8 @@ env: CARGO_PROFILE_DEV_DEBUG: 0 jobs: + # TODO: Add a pre-job check to skip if no change; may want to add something to check if there is a new rust version/week limit of skips? + initialize-job: name: initialize-job runs-on: ubuntu-latest diff --git a/.github/workflows/test-docs.yml b/.github/workflows/test-docs.yml index 9f76a306..e46bd909 100644 --- a/.github/workflows/test-docs.yml +++ b/.github/workflows/test-docs.yml @@ -10,7 +10,7 @@ concurrency: cancel-in-progress: ${{ github.event_name == 'pull_request' || github.repository != 'ClementTsang/bottom' }} jobs: - pre_job: + pre-job: runs-on: ubuntu-latest outputs: should_skip: ${{ steps.skip_check.outputs.should_skip }} @@ -24,8 +24,8 @@ jobs: test-build-documentation: name: Test building docs - needs: pre_job - if: ${{ needs.pre_job.outputs.should_skip != 'true' }} + needs: pre-job + if: ${{ needs.pre-job.outputs.should_skip != 'true' }} runs-on: ubuntu-latest steps: - name: Checkout repository