Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ on:

jobs:
test:
uses: rsocket/rsocket-kotlin/.github/workflows/run-tests.yml@master
uses: ./.github/workflows/run-tests.yml
2 changes: 1 addition & 1 deletion .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 13 additions & 9 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -16,9 +20,7 @@ jobs:
uses: gradle/gradle-build-action@v2
with:
arguments: |
jvmTest
jvm11Test
jvm17Test
jvm${{ matrix.target }}Test
--scan
--info
--continue
Expand All @@ -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
Expand All @@ -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
Expand Down