Skip to content

Commit

Permalink
Address PR feedback.
Browse files Browse the repository at this point in the history
Signed-off-by: Yury-Fridlyand <[email protected]>
  • Loading branch information
Yury-Fridlyand committed Sep 27, 2022
1 parent 489f2ad commit 63c5137
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 52 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
backport:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bi-connectors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
branches:
- 'main'
- '[1-9]+.[0-9x]+'
- '[1-9]+.[0-9x]+.[0-9x]+'
types: [opened, reopened]
push:
branches-ignore:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dco.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [pull_request]

jobs:
check:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
- name: Get PR Commits
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/delete_backport_branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/draft-release-notes-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 1 addition & 10 deletions .github/workflows/link-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/sql-cli-test-and-build-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sql-jdbc-test-and-build-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
java:
- 11
- 17
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
defaults:
run:
working-directory: sql-jdbc
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sql-test-and-build-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
java:
- 11
- 17
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
Expand All @@ -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
Expand Down
18 changes: 1 addition & 17 deletions .github/workflows/sql-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -26,7 +10,7 @@ jobs:
java:
- 11
- 17
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
Expand Down
12 changes: 1 addition & 11 deletions .github/workflows/sql-workbench-test-and-build-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand All @@ -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
Expand Down

0 comments on commit 63c5137

Please sign in to comment.