From 63c51377fbe6d3bbc0922242985b08f15801adc0 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Tue, 27 Sep 2022 13:52:35 -0700 Subject: [PATCH] Address PR feedback. Signed-off-by: Yury-Fridlyand --- .github/workflows/backport.yml | 2 +- .github/workflows/bi-connectors.yml | 2 +- .github/workflows/codeql-analysis.yml | 3 +-- .github/workflows/dco.yml | 2 +- .github/workflows/delete_backport_branch.yml | 2 +- .../workflows/draft-release-notes-workflow.yml | 3 +-- .github/workflows/link-checker.yml | 11 +---------- .../sql-cli-test-and-build-workflow.yml | 5 ++--- .../sql-jdbc-test-and-build-workflow.yml | 2 +- .../workflows/sql-test-and-build-workflow.yml | 4 ++-- .github/workflows/sql-test-workflow.yml | 18 +----------------- .../sql-workbench-test-and-build-workflow.yml | 12 +----------- 12 files changed, 14 insertions(+), 52 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 7cb0856a86..e47d8d88c0 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -7,7 +7,7 @@ on: jobs: backport: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest permissions: contents: write pull-requests: write diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml index 245c568fa9..45c76fd8e6 100644 --- a/.github/workflows/bi-connectors.yml +++ b/.github/workflows/bi-connectors.yml @@ -11,7 +11,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: Pack Tableau JDBC connector diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e043581de9..92ab3ddcf3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -5,7 +5,6 @@ on: branches: - 'main' - '[1-9]+.[0-9x]+' - - '[1-9]+.[0-9x]+.[0-9x]+' types: [opened, reopened] push: branches-ignore: @@ -17,7 +16,7 @@ on: jobs: analyze: name: CodeQL-Scan - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest permissions: security-events: write actions: read diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml index fc206f5ae1..cf30ea89dc 100644 --- a/.github/workflows/dco.yml +++ b/.github/workflows/dco.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: check: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Get PR Commits diff --git a/.github/workflows/delete_backport_branch.yml b/.github/workflows/delete_backport_branch.yml index ec69dcaa06..387a124b8c 100644 --- a/.github/workflows/delete_backport_branch.yml +++ b/.github/workflows/delete_backport_branch.yml @@ -6,7 +6,7 @@ on: jobs: delete-branch: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest if: startsWith(github.event.pull_request.head.ref,'backport/') steps: - name: Delete merged branch diff --git a/.github/workflows/draft-release-notes-workflow.yml b/.github/workflows/draft-release-notes-workflow.yml index c0a157ee40..559bc39c3b 100644 --- a/.github/workflows/draft-release-notes-workflow.yml +++ b/.github/workflows/draft-release-notes-workflow.yml @@ -7,12 +7,11 @@ on: branches: - 'main' - '[1-9]+.[0-9x]+' - - '[1-9]+.[0-9x]+.[0-9x]+' jobs: update_release_draft: name: Update draft release notes - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: # Drafts your next Release notes as Pull Requests are merged into "develop" - name: Update draft release notes diff --git a/.github/workflows/link-checker.yml b/.github/workflows/link-checker.yml index 5d49d8aee2..97b228fe72 100644 --- a/.github/workflows/link-checker.yml +++ b/.github/workflows/link-checker.yml @@ -7,20 +7,11 @@ on: branches: - 'main' - '[1-9]+.[0-9x]+' - - '[1-9]+.[0-9x]+.[0-9x]+' - paths: - - '**/*.pdf' - - '**/*.png' - - '**/*.jpg' - - '**/*.json' - - '**/*.md' - - '**/*.txt' - - '**/*.rst' jobs: linkchecker: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/sql-cli-test-and-build-workflow.yml b/.github/workflows/sql-cli-test-and-build-workflow.yml index 114813b9e2..608b65a5ab 100644 --- a/.github/workflows/sql-cli-test-and-build-workflow.yml +++ b/.github/workflows/sql-cli-test-and-build-workflow.yml @@ -12,15 +12,14 @@ on: jobs: build: - - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest defaults: run: working-directory: sql-cli strategy: matrix: python-version: [3.8] - opensearch-version: [ 2.2.1, latest ] + opensearch-version: [ latest ] steps: - name: Checkout SQL CLI diff --git a/.github/workflows/sql-jdbc-test-and-build-workflow.yml b/.github/workflows/sql-jdbc-test-and-build-workflow.yml index 2342e00cd6..b7d9564fc5 100644 --- a/.github/workflows/sql-jdbc-test-and-build-workflow.yml +++ b/.github/workflows/sql-jdbc-test-and-build-workflow.yml @@ -17,7 +17,7 @@ jobs: java: - 11 - 17 - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest defaults: run: working-directory: sql-jdbc diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml index bd9e496728..9d9758f5a1 100644 --- a/.github/workflows/sql-test-and-build-workflow.yml +++ b/.github/workflows/sql-test-and-build-workflow.yml @@ -25,7 +25,7 @@ jobs: java: - 11 - 17 - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -37,7 +37,7 @@ jobs: java-version: ${{ matrix.java }} - name: Build with Gradle - run: ./gradlew build assemble + run: ./gradlew --continue build assemble - name: Run backward compatibility tests run: ./scripts/bwctest.sh diff --git a/.github/workflows/sql-test-workflow.yml b/.github/workflows/sql-test-workflow.yml index 5ff8bbfc3b..9a20f53b87 100644 --- a/.github/workflows/sql-test-workflow.yml +++ b/.github/workflows/sql-test-workflow.yml @@ -2,22 +2,6 @@ name: SQL Plugin Tests on: workflow_dispatch: - push: - branches: - - 'dev-*' - paths: - - '**/*.java' - - '**/*.g4' - - '!sql-jdbc/**' - - '**gradle*' - - '**lombok*' - - '**checkstyle*' - - 'integ-test/**' - - 'docs/**' - - 'doctest/**' - - '**/*.jar' - - '**/*.pom' - - '.github/workflows/sql-test-workflow.yml' jobs: build: @@ -26,7 +10,7 @@ jobs: java: - 11 - 17 - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/sql-workbench-test-and-build-workflow.yml b/.github/workflows/sql-workbench-test-and-build-workflow.yml index 588c2ee3d7..ff42eb3e8c 100644 --- a/.github/workflows/sql-workbench-test-and-build-workflow.yml +++ b/.github/workflows/sql-workbench-test-and-build-workflow.yml @@ -7,13 +7,6 @@ on: branches-ignore: - 'dependabot/**' paths: - - '**/*.java' - - '**/*.g4' - - '!sql-jdbc/**' - - '**gradle*' - - '**lombok*' - - '**/*.jar' - - '**/*.pom' - 'workbench/**' - '.github/workflows/sql-workbench-test-and-build-workflow.yml' @@ -23,11 +16,8 @@ env: OPENSEARCH_PLUGIN_VERSION: 2.4.0.0 jobs: - build: - - runs-on: ubuntu-20.04 - + runs-on: ubuntu-latest steps: - name: Checkout Plugin uses: actions/checkout@v3