Skip to content

Commit

Permalink
Enable CI for windows (#1140)
Browse files Browse the repository at this point in the history
Signed-off-by: Peng Huo <penghuo@gmail.com>
  • Loading branch information
penghuo authored Dec 6, 2022
1 parent 8570a1f commit 62a6c1f
Show file tree
Hide file tree
Showing 55 changed files with 568 additions and 4,061 deletions.
28 changes: 17 additions & 11 deletions .github/workflows/sql-test-and-build-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,31 @@ env:
jobs:
build:
strategy:
# Run all jobs
fail-fast: false
matrix:
java:
- 8
- 11
- 14
runs-on: ubuntu-latest
entry:
- { os: ubuntu-latest, java: 8 }
- { os: windows-latest, java: 8, os_build_args: -x doctest -x integTest -x jacocoTestReport -x compileJdbc}
- { os: ubuntu-latest, java: 11 }
- { os: windows-latest, java: 11, os_build_args: -x doctest -x integTest -x jacocoTestReport -x compileJdbc}
- { os: ubuntu-latest, java: 14 }
- { os: windows-latest, java: 14, os_build_args: -x doctest -x integTest -x jacocoTestReport -x compileJdbc }
runs-on: ${{ matrix.entry.os }}

steps:
- uses: actions/checkout@v3

- name: Set up JDK ${{ matrix.java }}
- name: Set up JDK ${{ matrix.entry.java }}
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
java-version: ${{ matrix.entry.java }}

- name: Build with Gradle
run: ./gradlew --continue build assemble -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
run: ./gradlew --continue build ${{ matrix.entry.os_build_args }}

- name: Run backward compatibility tests
if: ${{ matrix.entry.os == 'ubuntu-latest' }}
run: ./bwctest.sh

- name: Create Artifact Path
Expand All @@ -51,7 +57,7 @@ jobs:
# This step uses the codecov-action Github action: https://github.com/codecov/codecov-action
- name: Upload SQL Coverage Report
if: always()
if: ${{ always() && matrix.entry.os == 'ubuntu-latest' }}
uses: codecov/codecov-action@v3
with:
flags: sql-engine
Expand All @@ -60,11 +66,11 @@ jobs:
- name: Upload Artifacts
uses: actions/upload-artifact@v2
with:
name: opensearch-sql
name: opensearch-sql-${{ matrix.entry.os }}
path: opensearch-sql-builds

- name: Upload test reports
if: always()
if: ${{ always() && matrix.entry.os == 'ubuntu-latest' }}
uses: actions/upload-artifact@v2
with:
name: test-reports
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/sql-workbench-test-and-build-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,15 @@ env:

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Enable longer filenames
if: ${{ matrix.os == 'windows-latest' }}
run: git config --system core.longpaths true

- name: Checkout Plugin
uses: actions/checkout@v3

Expand Down Expand Up @@ -51,7 +58,7 @@ jobs:
yarn test:jest --coverage
- name: Upload coverage
if: always()
if: ${{ matrix.os == 'ubuntu-latest' }}
uses: codecov/codecov-action@v3
with:
flags: query-workbench
Expand All @@ -68,5 +75,5 @@ jobs:
if: always()
uses: actions/upload-artifact@v1 # can't update to v3 because upload fails
with:
name: workbench
name: workbench-${{ matrix.os }}
path: ../OpenSearch-Dashboards/plugins/workbench/build
22 changes: 0 additions & 22 deletions integ-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -140,28 +140,6 @@ integTest {
exclude 'org/opensearch/sql/legacy/OrderIT.class'
}


task docTest(type: RestIntegTestTask) {
dependsOn ':plugin:bundlePlugin'

systemProperty 'tests.security.manager', 'false'
systemProperty('project.root', project.projectDir.absolutePath)

// Tell the test JVM if the cluster JVM is running under a debugger so that tests can use longer timeouts for
// requests. The 'doFirst' delays reading the debug setting on the cluster till execution time.
doFirst { systemProperty 'cluster.debug', getDebug() }

if (System.getProperty("test.debug") != null) {
jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005'
}

include 'org/opensearch/sql/doctest/**/*IT.class'
exclude 'org/opensearch/sql/correctness/**/*IT.class'
exclude 'org/opensearch/sql/ppl/**/*IT.class'
exclude 'org/opensearch/sql/sql/**/*IT.class'
exclude 'org/opensearch/sql/legacy/**/*IT.class'
}

task comparisonTest(type: RestIntegTestTask) {
dependsOn ':plugin:bundlePlugin'

Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit 62a6c1f

Please sign in to comment.