From 7aa4378262cb652fc8e95babe7f4797de0f7c61a Mon Sep 17 00:00:00 2001 From: Florian Gareis Date: Tue, 25 May 2021 14:31:53 +0200 Subject: [PATCH 1/6] Remove travis CI --- .travis.yml | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2eb421491..000000000 --- a/.travis.yml +++ /dev/null @@ -1,20 +0,0 @@ -addons: - chrome: stable - -language: node_js - -node_js: - - '12' - -install: - - npm ci - - npm run init - -script: - - npm run build - - npm run bundle - - npm run test-cov - - npm run check-format - -after_success: - - 'npm run merge-report && cat coverage/lcov.info | ./node_modules/.bin/coveralls' From 7460273994dcb86e2ec45fbbce24779460edc056 Mon Sep 17 00:00:00 2001 From: Florian Gareis Date: Tue, 25 May 2021 14:32:12 +0200 Subject: [PATCH 2/6] Run test coverage only on linux and only test on windows/macOS --- .github/workflows/ci.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9200fb47b..af09ce734 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,6 +26,17 @@ jobs: npm run build npm run bundle - name: Test + if: matrix.os != 'ubuntu-latest' + run: | + npm run test + - name: Test & Coverage + if: matrix.os == 'ubuntu-latest' run: | npm run test-cov npm run check-format + npm run merge-report && cat coverage/lcov.info + - name: Upload Coveralls Report + if: success() && matrix.os == 'ubuntu-latest' + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.COVERALLS_TOKEN }} From aa7766009e3f0b401ce92357e730e5e841de31db Mon Sep 17 00:00:00 2001 From: Stefan Dirix Date: Wed, 26 May 2021 14:13:57 +0200 Subject: [PATCH 3/6] Update ci.yaml --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index af09ce734..87b791933 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,4 +39,4 @@ jobs: if: success() && matrix.os == 'ubuntu-latest' uses: coverallsapp/github-action@master with: - github-token: ${{ secrets.COVERALLS_TOKEN }} + github-token: ${{ secrets.GITHUB_TOKEN }} From dd8fd1d7c5511aa3948c38d106eb8efdc3a9d79c Mon Sep 17 00:00:00 2001 From: Stefan Dirix Date: Wed, 26 May 2021 14:21:53 +0200 Subject: [PATCH 4/6] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e436d7c07..94efbcaa8 100644 --- a/README.md +++ b/README.md @@ -47,9 +47,10 @@ For more info about how we handle dependencies and releases in the JSON Forms pr ### Continuous Integration -The JSON Forms project is built and tested via [Travis](https://travis-ci.org/). Coverage is documented by [Coveralls](https://coveralls.io). +The JSON Forms project is built and tested via Github actions on Linux, Mac and Windows. Coverage is documented by [Coveralls](https://coveralls.io). -Current status: [![Build Status](https://travis-ci.org/eclipsesource/jsonforms.svg?branch=master)](https://travis-ci.org/eclipsesource/jsonforms) [![Coverage Status](https://coveralls.io/repos/eclipsesource/jsonforms/badge.svg?branch=master&service=github)](https://coveralls.io/github/eclipsesource/jsonforms?branch=master) +Current status: ![ci workflow](https://github.com/eclipsesource/jsonforms/actions/workflows/ci.yaml/badge.svg?branch=master) +[![Coverage Status](https://coveralls.io/repos/eclipsesource/jsonforms/badge.svg?branch=master&service=github)](https://coveralls.io/github/eclipsesource/jsonforms?branch=master) ## License From 8f282e925564b74bfd41315fe8445759cc98ffa2 Mon Sep 17 00:00:00 2001 From: Stefan Dirix Date: Wed, 26 May 2021 14:23:36 +0200 Subject: [PATCH 5/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 94efbcaa8..e7f5a3826 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ For more info about how we handle dependencies and releases in the JSON Forms pr The JSON Forms project is built and tested via Github actions on Linux, Mac and Windows. Coverage is documented by [Coveralls](https://coveralls.io). -Current status: ![ci workflow](https://github.com/eclipsesource/jsonforms/actions/workflows/ci.yaml/badge.svg?branch=master) +Current status: ![Build status](https://github.com/eclipsesource/jsonforms/actions/workflows/ci.yaml/badge.svg?branch=master) [![Coverage Status](https://coveralls.io/repos/eclipsesource/jsonforms/badge.svg?branch=master&service=github)](https://coveralls.io/github/eclipsesource/jsonforms?branch=master) ## License From 50b8aea2a900b1af2235692fba0406170ee8018d Mon Sep 17 00:00:00 2001 From: Stefan Dirix Date: Wed, 26 May 2021 14:48:18 +0200 Subject: [PATCH 6/6] Update package.json --- packages/core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/package.json b/packages/core/package.json index 6fc0197b7..b1db9cfb9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -38,7 +38,7 @@ "lint": "tslint --project tsconfig.json --exclude src/models/jsonSchema.ts", "report": "nyc report --reporter=html", "test": "ava", - "test-cov": "nyc ava", + "test-cov": "rimraf -rf .nyc_output && nyc ava", "doc": "typedoc --name 'JSON Forms Core' --mode file --excludeExternals --theme ../../typedoc-jsonforms --out docs src" }, "ava": {