aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsebastian.sellmair <sebastian.sellmair@jetbrains.com>2020-07-06 09:24:49 +0200
committerPaweł Marks <Kordyjan@users.noreply.github.com>2020-07-06 15:34:57 +0200
commit8c74dce76787ea930ec992a4b18f3c398038ab73 (patch)
treefe3c75a0657878cd5dcd00296915877f3616e321
parent163a7c484125a78cfe618f5ff363d36ad4cc3e5f (diff)
downloaddokka-8c74dce76787ea930ec992a4b18f3c398038ab73.tar.gz
dokka-8c74dce76787ea930ec992a4b18f3c398038ab73.tar.bz2
dokka-8c74dce76787ea930ec992a4b18f3c398038ab73.zip
Integrate gradle-integration-test.pr.yml into gradle-test.pr.yml
-rw-r--r--.github/workflows/gradle-integration-test.pr.yml13
-rw-r--r--.github/workflows/gradle-test.pr.yml13
2 files changed, 11 insertions, 15 deletions
diff --git a/.github/workflows/gradle-integration-test.pr.yml b/.github/workflows/gradle-integration-test.pr.yml
deleted file mode 100644
index bfc1b9d3..00000000
--- a/.github/workflows/gradle-integration-test.pr.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: CI (Integration Test)
-
-on: pull_request
-
-jobs:
- build:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-java@v1
- with:
- java-version: 11
- - run: ./gradlew clean integrationTest -s
diff --git a/.github/workflows/gradle-test.pr.yml b/.github/workflows/gradle-test.pr.yml
index 2838d975..6fabd602 100644
--- a/.github/workflows/gradle-test.pr.yml
+++ b/.github/workflows/gradle-test.pr.yml
@@ -1,9 +1,9 @@
-name: CI (Test)
+name: CI
on: pull_request
jobs:
- build:
+ test:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
@@ -14,3 +14,12 @@ jobs:
with:
java-version: 11
- run: ./gradlew clean test --stacktrace
+
+ integrationTest:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-java@v1
+ with:
+ java-version: 11
+ - run: ./gradlew clean integrationTest -s