Merge branch 'opensearch-project:main' into bwcTesting

stephen-crawford · Aug 9, 2023 · 819eb00 · 819eb00
2 parents 743a533 + 5f7efa5
commit 819eb00
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
  backport:
+ if: github.event.pull_request.merged == true
  runs-on: ubuntu-latest
  permissions:
  contents: write
@@ -25,6 +26,5 @@ jobs:
  uses: VachaShah/[email protected]
  with:
  github_token: ${{ steps.github_app_token.outputs.token }}
- branch_name: backport/backport-${{ github.event.number }}
  head_template: backport/backport-<%= number %>-to-<%= base %>
  failure_labels: backport-failed
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -126,11 +126,11 @@ jobs:
  - uses: actions/setup-java@v1
  with:
  java-version: 11
- - uses: github/codeql-action/init@v1
+ - uses: github/codeql-action/init@v2
  with:
  languages: java
- - run: ./gradlew clean build -Dbuild.snapshot=false -x test -x integrationTest
- - uses: github/codeql-action/analyze@v1
+ - run: ./gradlew clean assemble
+ - uses: github/codeql-action/analyze@v2
 
  build-artifact-names:
  runs-on: ubuntu-latest