diff --git a/projects/hipother/.github/workflows/clang-format.yml b/projects/hipother/.github/workflows/clang-format.yml index 7e37ebbe97..0298b5fc76 100644 --- a/projects/hipother/.github/workflows/clang-format.yml +++ b/projects/hipother/.github/workflows/clang-format.yml @@ -1,11 +1,11 @@ -name: Clang format check - +name: Clang format check on: - push: + pull_request: + types: [synchronize, opened] jobs: format: - runs-on: hip-clr-dev1 + runs-on: AMD-ROCm-Internal-dev1 steps: - uses: actions/checkout@v4 with: @@ -19,4 +19,4 @@ jobs: id: clang-format run: | chmod +x .github/hooks/clang-format-check.sh - ./.github/hooks/clang-format-check.sh --range "${{ github.event.before }}..${{ github.sha }}" + ./.github/hooks/clang-format-check.sh --range "${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}" diff --git a/projects/hipother/.github/workflows/keyword-check.yml b/projects/hipother/.github/workflows/keyword-check.yml index b177ae4bff..12108cee14 100644 --- a/projects/hipother/.github/workflows/keyword-check.yml +++ b/projects/hipother/.github/workflows/keyword-check.yml @@ -9,7 +9,7 @@ on: jobs: check-keywords: - runs-on: hip-clr-dev1 + runs-on: AMD-ROCm-Internal-dev1 env: KEYWORDS: ${{ vars.KEYWORDS }} diff --git a/projects/hipother/.github/workflows/pr-title-validate.yml b/projects/hipother/.github/workflows/pr-title-validate.yml index c6ffbd28b2..f68440d948 100644 --- a/projects/hipother/.github/workflows/pr-title-validate.yml +++ b/projects/hipother/.github/workflows/pr-title-validate.yml @@ -21,7 +21,7 @@ jobs: fi validate-commit-messages: - runs-on: hip-clr-dev1 + runs-on: AMD-ROCm-Internal-dev1 steps: - name: Checkout code uses: actions/checkout@v3 @@ -35,8 +35,12 @@ jobs: echo "$COMMITS" echo "$COMMITS" | while read -r hash message; do echo -e "$hash $message\n " - if [[ ! "$message" =~ ^SWDEV-[0-9]+ ]]; then - echo "::error:: $hash commit should start with Jira ticket ID, SWDEV-" + if [[ "$message" =~ ^SWDEV-[0-9]+ ]]; then + echo "Valid JIRA ticket format" + elif [[ "$message" =~ ^Merge\ branch ]]; then + echo "Merge commits are allowed" + else + echo "::error:: $hash commit should start with Jira ticket ID, SWDEV- or be a merge commit" exit 1 fi done diff --git a/projects/hipother/.github/workflows/validate-pr-description.yml b/projects/hipother/.github/workflows/validate-pr-description.yml index 63c0fb87e7..d9b12b4ba6 100644 --- a/projects/hipother/.github/workflows/validate-pr-description.yml +++ b/projects/hipother/.github/workflows/validate-pr-description.yml @@ -6,7 +6,7 @@ on: jobs: validate-pr-description: - runs-on: hip-clr-dev1 + runs-on: AMD-ROCm-Internal-dev1 steps: - name: Checkout repository uses: actions/checkout@v4