From 79ffb14b81e8906b0e183483e51d10e2745b2347 Mon Sep 17 00:00:00 2001 From: Lantao Jin Date: Thu, 9 Jan 2025 11:31:58 +0800 Subject: [PATCH 1/2] Dedup running workflows on push action with auto-backport (#2843) Signed-off-by: Lantao Jin --- .github/workflows/codeql-analysis.yml | 1 + .github/workflows/integ-tests-with-security.yml | 1 + .github/workflows/sql-test-and-build-workflow.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 38fca306bf..daeb5197a2 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -7,6 +7,7 @@ on: - '[1-9]+.[0-9x]+' push: branches-ignore: + - 'backport/**' - 'dependabot/**' paths: - '**/*.java' diff --git a/.github/workflows/integ-tests-with-security.yml b/.github/workflows/integ-tests-with-security.yml index e7c52f4231..8d55571b91 100644 --- a/.github/workflows/integ-tests-with-security.yml +++ b/.github/workflows/integ-tests-with-security.yml @@ -4,6 +4,7 @@ on: pull_request: push: branches-ignore: + - 'backport/**' - 'dependabot/**' paths: - 'integ-test/**' diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml index e82cedeb7b..cbc22645fc 100644 --- a/.github/workflows/sql-test-and-build-workflow.yml +++ b/.github/workflows/sql-test-and-build-workflow.yml @@ -4,6 +4,7 @@ on: pull_request: push: branches-ignore: + - 'backport/**' - 'dependabot/**' paths: - '**/*.java' From 0e61d20c9a5144d7d214523b4d6b38c44d127be5 Mon Sep 17 00:00:00 2001 From: Lantao Jin Date: Fri, 10 Jan 2025 01:20:49 +0800 Subject: [PATCH 2/2] Revert "Build subprojects in parallel (#3223)" (#3234) This reverts commit 44a92c58a2295e55cdd3cf0f3c865d487fc69c7b. Signed-off-by: Lantao Jin --- .github/workflows/sql-test-and-build-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml index cbc22645fc..010590a021 100644 --- a/.github/workflows/sql-test-and-build-workflow.yml +++ b/.github/workflows/sql-test-and-build-workflow.yml @@ -52,7 +52,7 @@ jobs: - name: Build with Gradle run: | chown -R 1000:1000 `pwd` - su `id -un 1000` -c "./gradlew --continue --parallel build" + su `id -un 1000` -c "./gradlew --continue build" - name: Create Artifact Path run: | @@ -114,7 +114,7 @@ jobs: java-version: ${{ matrix.entry.java }} - name: Build with Gradle - run: ./gradlew --continue --parallel build ${{ matrix.entry.os_build_args }} + run: ./gradlew --continue build ${{ matrix.entry.os_build_args }} - name: Create Artifact Path run: |