From 0ed2fa58422cdb3e65418d3694b318df93eae08c Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Tue, 1 Aug 2023 12:52:01 +0200 Subject: [PATCH] Move from bors to merge queue and update github actions dependencies --- .github/pull_request_template.md | 29 ++++++++++++++++++++++------ .github/workflows/build.yml | 27 +++++++++++++------------- .github/workflows/daily_security.yml | 2 +- .github/workflows/reviewdog.yaml | 16 +++++++-------- bors.toml | 9 --------- 5 files changed, 46 insertions(+), 37 deletions(-) delete mode 100644 bors.toml diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 14b102760..643ee52d2 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,13 +2,30 @@ *Please add a description here. This will become the commit message of the merge request later.* - +## Definition of Done Checklist -## Review Checklist +- Not all of these items are applicable to all PRs, the author should update this template to only leave the boxes in that are relevant +- Please make sure all these things are done and tick the boxes + + +```[tasklist] +# Author +- [ ] Changes are OpenShift compatible +- [ ] CRD changes approved +- [ ] Integration tests passed (for non trivial changes) +``` + +```[tasklist] +# Reviewer - [ ] Code contains useful comments -- [ ] (Integration-)Test cases added (or not applicable) -- [ ] Documentation added (or not applicable) -- [ ] Changelog updated (or not applicable) +- [ ] (Integration-)Test cases added +- [ ] Documentation added or updated +- [ ] Changelog updated - [ ] Cargo.toml only contains references to git tags (not specific commits or branches) +``` -Once the review is done, comment `bors r+` (or `bors merge`) to merge. [Further information](https://bors.tech/documentation/getting-started/#reviewing-pull-requests) +```[tasklist] +# Acceptance +- [ ] Feature Tracker has been updated +- [ ] Proper release label has been added +``` diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 00bdf19cf..05d2bd569 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,6 +11,7 @@ on: tags: - "*" pull_request: + merge_group: env: CARGO_TERM_COLOR: always @@ -29,11 +30,11 @@ jobs: env: RUSTC_BOOTSTRAP: 1 steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }} - - uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0 + - uses: Swatinem/rust-cache@dd05243424bd5c0e585e4b55eb2d7615cdd32f1f # v2 with: key: udeps - run: cargo install --locked cargo-udeps@0.1.39 @@ -52,8 +53,8 @@ jobs: continue-on-error: ${{ matrix.checks == 'advisories' }} steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 - - uses: EmbarkStudios/cargo-deny-action@8a8607bd8e2b3a514d5a40174cc7c55b229d9ba7 # v1.4.0 + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + - uses: EmbarkStudios/cargo-deny-action@a50c7d5f86370e02fae8472c398f15a36e517bb8 # v1 with: command: check ${{ matrix.checks }} @@ -61,12 +62,12 @@ jobs: name: Run Rustfmt runs-on: ubuntu-latest steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }} components: rustfmt - - uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0 + - uses: Swatinem/rust-cache@dd05243424bd5c0e585e4b55eb2d7615cdd32f1f # v2 with: key: fmt - run: cargo fmt --all -- --check @@ -79,18 +80,18 @@ jobs: run: | sudo apt-get update sudo apt-get install protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 with: submodules: recursive - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }} components: clippy - - uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0 + - uses: Swatinem/rust-cache@dd05243424bd5c0e585e4b55eb2d7615cdd32f1f # v2 with: key: clippy - name: Run clippy action to produce annotations - uses: giraffate/clippy-action@13b9d32482f25d29ead141b79e7e04e7900281e0 # v1.0.1 + uses: giraffate/clippy-action@13b9d32482f25d29ead141b79e7e04e7900281e0 # v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} if: env.GITHUB_TOKEN != null @@ -108,12 +109,12 @@ jobs: name: Run RustDoc runs-on: ubuntu-latest steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }} components: rustfmt - - uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0 + - uses: Swatinem/rust-cache@dd05243424bd5c0e585e4b55eb2d7615cdd32f1f # v2 with: key: doc - run: cargo doc --document-private-items @@ -127,11 +128,11 @@ jobs: - run_rustdoc runs-on: ubuntu-latest steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }} - - uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0 + - uses: Swatinem/rust-cache@dd05243424bd5c0e585e4b55eb2d7615cdd32f1f # v2 with: key: test - run: cargo test diff --git a/.github/workflows/daily_security.yml b/.github/workflows/daily_security.yml index ae111744e..937948193 100644 --- a/.github/workflows/daily_security.yml +++ b/.github/workflows/daily_security.yml @@ -10,7 +10,7 @@ jobs: audit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 - uses: rustsec/audit-check@dd51754d4e59da7395a4cd9b593f0ff2d61a9b95 # v1.4.1 with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/reviewdog.yaml b/.github/workflows/reviewdog.yaml index 4f5bab9df..7055af876 100644 --- a/.github/workflows/reviewdog.yaml +++ b/.github/workflows/reviewdog.yaml @@ -13,31 +13,31 @@ jobs: actionlint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 - - uses: reviewdog/action-actionlint@b6feb003955cad286985c42e7047f4567a798f3f # v1.36.0 + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + - uses: reviewdog/action-actionlint@7485c2136bd093d2317a854c72910eebaee35238 # v1 with: github_token: ${{ secrets.GITHUB_TOKEN }} detect-secrets: runs-on: ubuntu-latest steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 - - uses: reviewdog/action-detect-secrets@12f2ab19731110962f547d78960315f3065be4c4 # v0.11.3 + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + - uses: reviewdog/action-detect-secrets@b04766f677ad3366ec30246a60d84522aba6c710 # v0 with: github_token: ${{ secrets.github_token }} markdownlint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 - - uses: reviewdog/action-markdownlint@97e3df02fe1573d505a7b268046a44fa5409cbc3 # tag=v0.9 + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + - uses: reviewdog/action-markdownlint@e3a1300e4ead323f710e9b711ee269e0d29ba5ec # v0 with: github_token: ${{ secrets.GITHUB_TOKEN }} yamllint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 - - uses: reviewdog/action-yamllint@8c429dfe4fc47b1ce1fa99a64e94693880d5dc30 # tag=v1.6.1 + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + - uses: reviewdog/action-yamllint@49fe172669b506f0c688207a67b4cf93fee52699 # v1 with: github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/bors.toml b/bors.toml deleted file mode 100644 index 420d30c84..000000000 --- a/bors.toml +++ /dev/null @@ -1,9 +0,0 @@ -status = [ - 'All tests passed' -] -delete_merged_branches = true -use_squash_merge = true -pr_status = [ 'license/cla' ] -timeout_sec = 7200 -cut_body_after = "" -required_approvals = 1