From 33f3b63acbe2f82fa1ac901edc1d0360d34671c7 Mon Sep 17 00:00:00 2001 From: James Blair Date: Thu, 23 May 2024 06:06:48 +1200 Subject: [PATCH 1/2] Complete migration of verify workflow to prow. Signed-off-by: James Blair --- .github/workflows/static-analysis.yaml | 46 -------------------------- 1 file changed, 46 deletions(-) delete mode 100644 .github/workflows/static-analysis.yaml diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml deleted file mode 100644 index 11348ded591..00000000000 --- a/.github/workflows/static-analysis.yaml +++ /dev/null @@ -1,46 +0,0 @@ ---- -name: Static Analysis -on: [push, pull_request] -permissions: read-all -jobs: - run: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 - with: - go-version: ${{ steps.goversion.outputs.goversion }} - - run: | - go install github.com/golangci/golangci-lint/cmd/golangci-lint@"$(cd tools/mod && go list -m -f {{.Version}} github.com/golangci/golangci-lint)" - - name: protoc - uses: arduino/setup-protoc@149f6c87b92550901b26acd1632e11c3662e381f # v1.3.0 - with: - version: '3.20.3' - repo-token: ${{ secrets.GITHUB_TOKEN }} - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - run: | - set -euo pipefail - - cargo install marker --version 0.9.0 - - run: | - set -euo pipefail - - make verify - - run: | - set -euo pipefail - - make fix - - DIFF=$(git status --porcelain) - - if [ -n "$DIFF" ]; then - echo "These files were modified:" - echo - echo "$DIFF" - echo - exit 1 - fi From 32726e724a4b866a2e69568a3b9b7837e3ba6296 Mon Sep 17 00:00:00 2001 From: James Blair Date: Thu, 23 May 2024 06:36:50 +1200 Subject: [PATCH 2/2] Update documentation for migration to prow. Signed-off-by: James Blair --- CONTRIBUTING.md | 3 ++- Documentation/contributor-guide/triage_prs.md | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9f191346876..11ba96feb95 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -175,7 +175,8 @@ releases. ## Get your pull request reviewed -Before requesting review please ensure that all GitHub checks were successful. +Before requesting review please ensure that all GitHub and Prow checks are successful. In some cases your pull request may have the label `needs-ok-to-test`. If so an `etcd-io` organisation member will leave a comment on your pull request with `/ok-to-test` to trigger all checks to be run. + It might happen that some unrelated tests on your PR are failing, due to their flakiness. In such cases please [file an issue] to deflake the problematic test and ask one of [maintainers] to rerun the tests. diff --git a/Documentation/contributor-guide/triage_prs.md b/Documentation/contributor-guide/triage_prs.md index 3b94495109b..ffa0f7a1d8d 100644 --- a/Documentation/contributor-guide/triage_prs.md +++ b/Documentation/contributor-guide/triage_prs.md @@ -16,6 +16,10 @@ Following are a few example searches on PR for convenience: These guidelines serve as a primary document for managing PRs in `etcd`. Everyone is welcome to help manage PRs but the work and responsibilities discussed in this document are created with `etcd` maintainers and active contributors in mind. +## Ensure tests are run + +The etcd project use Kubernetes Prow and GitHub Actions to run tests. To ensure all required tests run if a pull request is ready for testing and still has the `needs-ok-to-test` label then please comment on the pull request `/ok-to-test`. + ## Handle inactive PRs Poke PR owner if review comments are not addressed in 15 days. If the PR owner does not reply in 90 days, update the PR with a new commit if possible. If not, inactive PR should be closed after 180 days.