This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch gh-readonly-queue/main/pr-62-d5d3e5d4c3f87543609a013daa0acced0d222c97 in repository https://gitbox.apache.org/repos/asf/kafka-merge-queue-sandbox.git
commit e63475f78bed47e2abc3de8b52bc2aa207333263 Author: David Arthur <[email protected]> AuthorDate: Wed Mar 12 15:08:14 2025 -0400 create separate merge_group workflow (#62) --- .github/workflows/ci.yml | 42 ------------------------------------------ .github/workflows/merge.yml | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7837848..fb05b8c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,9 +20,6 @@ on: types: [ opened, synchronize, ready_for_review, reopened ] branches: ["main"] - merge_group: - types: [checks_requested] - concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }} @@ -39,45 +36,6 @@ jobs: uses: actions/checkout@v4 with: persist-credentials: false - - name: Setup Python - uses: ./.github/actions/setup-python - - name: Setup Gradle - uses: ./.github/actions/setup-gradle - with: - java-version: 23 - gradle-cache-read-only: true - gradle-cache-write-only: false - develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - - name: Compile and validate - env: - SCAN_ARG: '--no-scan' - # Gradle flags - # --build-cache: Let Gradle restore the build cache - # --info: For now, we'll generate lots of logs while setting up the GH Actions - # --scan: Publish the build scan. This will only work on PRs from apache/kafka and trunk - # --no-scan: For public fork PRs, we won't attempt to publish the scan - run: | - ./gradlew --build-cache --info $SCAN_ARG check siteDocTar -x test - - name: Annotate checkstyle errors - if: failure() - run: python .github/scripts/checkstyle.py - env: - GITHUB_WORKSPACE: ${{ github.workspace }} - - name: Annotate Rat errors - if: failure() - run: python .github/scripts/rat.py - env: - GITHUB_WORKSPACE: ${{ github.workspace }} - - name: Check generated documentation - # Check if there are any empty files under ./site-docs/generated, If any empty files are found, print an error - # message and list the empty files - run: | - tar zxvf core/build/distributions/kafka_2.13-$(./gradlew properties | grep version: | awk '{print $NF}' | head -n 1)-site-docs.tgz - if find ./site-docs/generated -type f -exec grep -L "." {} \; | grep -q "."; then - echo "One or more documentation files are empty!" >&2 - find ./site-docs/generated -type f -exec grep -L "." {} \; >&2 - exit 1 - fi build: uses: ./.github/workflows/build.yml diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml new file mode 100644 index 0000000..8901d21 --- /dev/null +++ b/.github/workflows/merge.yml @@ -0,0 +1,42 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: Merge Patch + +on: + merge_group: + types: [checks_requested] + +jobs: + validate-patch: + runs-on: ubuntu-latest + steps: + - name: Env + run: printenv + env: + GITHUB_CONTEXT: ${{ toJson(github) }} + - name: Checkout code + uses: actions/checkout@v4 + with: + persist-credentials: false + - name: Setup Python + uses: ./.github/actions/setup-python + - name: Setup Gradle + uses: ./.github/actions/setup-gradle + with: + java-version: 23 + gradle-cache-read-only: true + gradle-cache-write-only: false + develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
