diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-12-18 10:14:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-18 10:14:44 +0000 |
| commit | dfd685c34cc27a7618f6d705899d05c9c04bffdd (patch) | |
| tree | 808a848398c295a3bf38ed38846b8858298aceeb | |
| parent | 817e2239286ff3a7d7c6996587d64a7e16a95b7f (diff) | |
| parent | 451f8f9f14acb516f0f2cd6d2d3ba496fc479d29 (diff) | |
Merge #11
11: Ci optimizations r=matthiasbeyer a=matthiasbeyer
Co-authored-by: Matthias Beyer <mail@beyermatthias.de>
| -rw-r--r-- | .github/workflows/ci.yml | 36 | ||||
| -rw-r--r-- | .github/workflows/commit-lint.yml | 19 | ||||
| -rw-r--r-- | .gitlint | 8 |
3 files changed, 30 insertions, 33 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9da6055..3aec624 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,17 +9,13 @@ jobs: strategy: matrix: rust: - - nightly - - beta - - stable - 1.60.0 + - stable steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: - profile: minimal toolchain: ${{ matrix.rust }} - override: true - uses: actions-rs/cargo@v1 with: command: check @@ -31,7 +27,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: 1.60.0 - run: rustup component add rustfmt @@ -41,37 +37,19 @@ jobs: command: fmt args: -- --check - dco-check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Setup Python - uses: actions/setup-python@v4.3.1 - with: - python-version: '3.x' - - name: Install gitlint - run: pip install gitlint - - run: gitlint --commits $(git merge-base origin/master HEAD).. - test: name: Test Suite runs-on: ubuntu-latest strategy: matrix: rust: - - nightly - - beta - - stable - 1.60.0 + - stable steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: - profile: minimal toolchain: ${{ matrix.rust }} - override: true - run: sudo apt-get update && sudo apt-get install -y taskwarrior - uses: actions-rs/cargo@v1 with: @@ -89,10 +67,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: 1.60.0 - override: true - uses: swatinem/rust-cache@v2 - run: rustup component add clippy - name: cargo-clippy @@ -104,7 +81,6 @@ jobs: needs: - check - clippy - - dco-check - test runs-on: ubuntu-latest steps: diff --git a/.github/workflows/commit-lint.yml b/.github/workflows/commit-lint.yml new file mode 100644 index 0000000..8b151cb --- /dev/null +++ b/.github/workflows/commit-lint.yml @@ -0,0 +1,19 @@ +on: pull_request + +name: CI + +jobs: + commitlint: + name: Commit lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + with: + fetch-depth: 0 + - name: Setup Python + uses: actions/setup-python@v4.0.0 + with: + python-version: '3.x' + - name: Install gitlint + run: pip install gitlint + - run: gitlint --commits $(git merge-base origin/master HEAD).. @@ -17,8 +17,8 @@ ignore=body-is-missing # By default gitlint will ignore merge, revert, fixup and squash commits. ignore-merge-commits=true # ignore-revert-commits=true -# ignore-fixup-commits=true -# ignore-squash-commits=true +ignore-fixup-commits=false +ignore-squash-commits=false # Ignore any data send to gitlint via stdin # ignore-stdin=true @@ -38,7 +38,7 @@ ignore-merge-commits=true # Enable community contributed rules # See http://jorisroovers.github.io/gitlint/contrib_rules for details -contrib=CC1 +contrib=CC1, CC2 # Set the extra-path where gitlint will search for user defined rules # See http://jorisroovers.github.io/gitlint/user_defined_rules for details @@ -134,4 +134,6 @@ regex=(.*)dependabot(.*) # types = bugfix,user-story,epic [contrib-body-requires-signed-off-by] +[contrib-disallow-cleanup-commits] + |