From aae4d87707f4fb16e5b1d7afe92be2e2775140f5 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Sun, 29 Oct 2023 12:32:10 +0200 Subject: [PATCH] fix Actions run rules Signed-off-by: Avi Deitcher --- .github/workflows/build.yml | 9 +++++---- .github/workflows/codeql.yml | 10 ++-------- .github/workflows/publish.yml | 6 ++---- .github/workflows/request_codeowners_review.yml | 2 -- .github/workflows/unit.yml | 8 ++------ .github/workflows/yetus.yml | 4 +--- 6 files changed, 12 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4e0890a..7a788f3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,18 +1,19 @@ --- name: PR build on: # yamllint disable-line rule:truthy + push: + branches: + - "main" pull_request: branches: - - "master" - - "[0-9]+.[0-9]+" - - "[0-9]+.[0-9]+-stable" + - "main" concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number }} cancel-in-progress: true jobs: - packages: + build: runs-on: ubuntu-22.04 strategy: fail-fast: false diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 90cf910..0233343 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -9,17 +9,11 @@ name: "CodeQL" on: # yamllint disable-line rule:truthy push: branches: - - "master" - - "[0-9]+.[0-9]+" - - "[0-9]+.[0-9]+-stable" + - "main" pull_request: # The branches below must be a subset of the branches above branches: - - "master" - - "[0-9]+.[0-9]+" - - "[0-9]+.[0-9]+-stable" - schedule: - - cron: '42 6 * * 2' + - "main" jobs: analyze: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9e3c2ce..f787ff6 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,15 +3,13 @@ name: Publish on: # yamllint disable-line rule:truthy push: branches: - - "master" - - "[0-9]+.[0-9]+" - - "[0-9]+.[0-9]+-stable" + - "main" tags: - "[0-9]+.[0-9]+.[0-9]+" - "[0-9]+.[0-9]+.[0-9]+-lts" jobs: - packages: + publish: runs-on: ubuntu-22.04 strategy: fail-fast: false diff --git a/.github/workflows/request_codeowners_review.yml b/.github/workflows/request_codeowners_review.yml index d187a2c..65d156d 100644 --- a/.github/workflows/request_codeowners_review.yml +++ b/.github/workflows/request_codeowners_review.yml @@ -11,8 +11,6 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - with: - fetch-depth: ${{ github.event.pull_request.commits + 1 }} - name: Auto request review env: diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 890dcbc..2d3b69f 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -3,14 +3,10 @@ name: Unit tests on: # yamllint disable-line rule:truthy push: branches: - - "master" - - "[0-9]+.[0-9]+" - - "[0-9]+.[0-9]+-stable" + - "main" pull_request: branches: - - "master" - - "[0-9]+.[0-9]+" - - "[0-9]+.[0-9]+-stable" + - "main" jobs: test: diff --git a/.github/workflows/yetus.yml b/.github/workflows/yetus.yml index 64c6b27..d7ac6dc 100644 --- a/.github/workflows/yetus.yml +++ b/.github/workflows/yetus.yml @@ -10,9 +10,7 @@ name: Apache Yetus on: # yamllint disable-line rule:truthy pull_request: branches: - - "master" - - "[0-9]+.[0-9]+" - - "[0-9]+.[0-9]+-stable" + - "main" jobs: yetus: