Merge remote-tracking branch 'upstream/main' into issues/2826

opensearch-project · Jan 10, 2025 · 4908a47 · 4908a47
2 parents c1d7029 + 0e61d20
commit 4908a47
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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
@@ -4,6 +4,7 @@ on:
   pull_request:
   push:
     branches-ignore:
+      - 'backport/**'
       - 'dependabot/**'
     paths:
       - '**/*.java'
@@ -51,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: |
@@ -113,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: |