From c48cbaa38e20304f22dec6046185464442d93e04 Mon Sep 17 00:00:00 2001 From: olme04 Date: Thu, 27 Jan 2022 15:05:15 +0000 Subject: [PATCH 1/2] use local paths instead of absolute for reusable workflows --- .github/workflows/ci-dev.yml | 4 ++-- .github/workflows/ci-main.yml | 4 ++-- .github/workflows/ci-pr.yml | 2 +- .github/workflows/ci-release.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-dev.yml b/.github/workflows/ci-dev.yml index cf9a14a35..6e0d91f3a 100644 --- a/.github/workflows/ci-dev.yml +++ b/.github/workflows/ci-dev.yml @@ -8,9 +8,9 @@ on: jobs: test: - uses: rsocket/rsocket-kotlin/.github/workflows/run-tests.yml@master + uses: ./.github/workflows/run-tests.yml publish: needs: [ test ] - uses: rsocket/rsocket-kotlin/.github/workflows/publish-snapshot.yml@master + uses: ./.github/workflows/publish-snapshot.yml with: add-branch-suffix: true diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index 601c15d09..f8f516167 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -8,9 +8,9 @@ on: jobs: test: - uses: rsocket/rsocket-kotlin/.github/workflows/run-tests.yml@master + uses: ./.github/workflows/run-tests.yml publish: needs: [ test ] - uses: rsocket/rsocket-kotlin/.github/workflows/publish-snapshot.yml@master + uses: ./.github/workflows/publish-snapshot.yml with: add-branch-suffix: false diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 65f4e09d5..32705f7c9 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -6,4 +6,4 @@ on: jobs: test: - uses: rsocket/rsocket-kotlin/.github/workflows/run-tests.yml@master + uses: ./.github/workflows/run-tests.yml diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index 78790e6a7..809f934b7 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -6,7 +6,7 @@ on: jobs: test: - uses: rsocket/rsocket-kotlin/.github/workflows/run-tests.yml@master + uses: ./.github/workflows/run-tests.yml publish: needs: [ test ] runs-on: macos-11 From 9e988eb7981bb15cfd77232fde46d8f512d65dcf Mon Sep 17 00:00:00 2001 From: olme04 Date: Mon, 7 Feb 2022 09:47:07 +0000 Subject: [PATCH 2/2] split jvm tests runs per jdk and js tests runs per backend --- .github/workflows/run-tests.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 09e7aa0a5..d6a126250 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -6,8 +6,12 @@ env: jobs: jvm-test: - name: Run JVM tests + name: Run JVM(${{ matrix.target }}) tests runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + target: [ '', '11', '17' ] steps: - uses: actions/checkout@v2 - run: echo "KONAN_DATA_DIR=${HOME}/.gradle/konan" >> $GITHUB_ENV @@ -16,9 +20,7 @@ jobs: uses: gradle/gradle-build-action@v2 with: arguments: | - jvmTest - jvm11Test - jvm17Test + jvm${{ matrix.target }}Test --scan --info --continue @@ -36,8 +38,12 @@ jobs: retention-days: 1 js-test: - name: Run JS tests + name: Run JS(${{ matrix.target }}) tests runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + target: [ Ir, Legacy ] steps: - uses: actions/checkout@v2 - run: echo "KONAN_DATA_DIR=${HOME}/.gradle/konan" >> $GITHUB_ENV @@ -46,10 +52,8 @@ jobs: uses: gradle/gradle-build-action@v2 with: arguments: | - jsIrNodeTest - jsIrBrowserTest - jsLegacyNodeTest - jsLegacyBrowserTest + js${{ matrix.target }}NodeTest + js${{ matrix.target }}BrowserTest --scan --info --continue