From 87d1d1023ff34360a92a2ea46e34e809a689d1a6 Mon Sep 17 00:00:00 2001 From: Nemanja Martinovic Date: Tue, 4 May 2021 16:50:27 -0400 Subject: [PATCH 1/2] Update GitHub Actions, remove Travis, Vexor --- .github/workflows/ci_test.yml | 4 ++-- .travis.yml | 16 ---------------- .vexor.yml | 7 ------- 3 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 .travis.yml delete mode 100644 .vexor.yml diff --git a/.github/workflows/ci_test.yml b/.github/workflows/ci_test.yml index df2b87ca0..b8e41eba4 100644 --- a/.github/workflows/ci_test.yml +++ b/.github/workflows/ci_test.yml @@ -6,8 +6,6 @@ jobs: build: runs-on: ubuntu-latest - env: - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} steps: - uses: actions/checkout@v2 @@ -19,3 +17,5 @@ jobs: - run: npm ci - run: grunt setup - run: grunt test:prod + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 95002b426..000000000 --- a/.travis.yml +++ /dev/null @@ -1,16 +0,0 @@ -language: node_js -node_js: '11.14.0' -cache: npm -git: - submodules: false -before_install: npm install -g grunt-cli -install: npm install -deployg: grunt release -before_script: grunt setup -script: - - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then echo "grunt test:prod"; grunt test:prod; fi - #- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then echo "grunt sauce"; grunt sauce; fi -env: - global: - - secure: 'QiHFURctWLbr3uGEwqgABdKBzzXHHD819h4XTQsJ90Lcv04DsSzXZV0GAHa1bXiNIrNwxZD7T7fsakOBViEjIsginD1ZFAUMkR5KHYII3Gzlpu1ikuIHBrrPRLzTFhrsnJxFDRau9gwLeIoTgIP5AC3bw8ne/+6Oe6mW2fpphgU=' - - secure: 'SRFYya2d43gzs0WWmYhIqekI1gUoxqeox/hlc7vn6dEWxVNFsHA0oWkMSivSY8y9fqvUyh4p40e4NDlN86EnGF9aq/r4iNBMlIR0UVuxjVBi8HaMR5w3/JvlD7gNI7Y6du0cpkJaVAekJbi21HP1bmcV0sYXcXUj6uL4HUVq4sw=' diff --git a/.vexor.yml b/.vexor.yml deleted file mode 100644 index bcb168583..000000000 --- a/.vexor.yml +++ /dev/null @@ -1,7 +0,0 @@ -language: node_js -node_js: - - "0.11" - - "0.10" -before_install: sudo npm install -g grunt-cli -install: sudo npm install -before_script: sudo grunt setup From 51438206ff57203fe9b339b1a1ac8b47645f5566 Mon Sep 17 00:00:00 2001 From: Nemanja Martinovic Date: Tue, 4 May 2021 19:56:30 -0400 Subject: [PATCH 2/2] Remove coveralls upload from grunt to separate GitHub Action step --- .github/workflows/ci_test.yml | 9 +++++++-- grunt/aliases.yaml | 1 - grunt/exec.js | 4 ---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci_test.yml b/.github/workflows/ci_test.yml index b8e41eba4..d70475204 100644 --- a/.github/workflows/ci_test.yml +++ b/.github/workflows/ci_test.yml @@ -17,5 +17,10 @@ jobs: - run: npm ci - run: grunt setup - run: grunt test:prod - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Coveralls + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + path-to-lcov: "test/coverage/reports/lcov/lcov.info" + diff --git a/grunt/aliases.yaml b/grunt/aliases.yaml index 32164e225..8a3485099 100644 --- a/grunt/aliases.yaml +++ b/grunt/aliases.yaml @@ -86,7 +86,6 @@ test:prod: - server:once - puppet:prod - coverage-report:coveralls - - exec:coveralls-report test: - clean:temp diff --git a/grunt/exec.js b/grunt/exec.js index 4f7593ee4..ab67c6936 100644 --- a/grunt/exec.js +++ b/grunt/exec.js @@ -22,10 +22,6 @@ module.exports = { 'nyc-instrument': { cmd: 'node_modules/.bin/nyc instrument dist/js/ test/coverage/instrument', }, - 'coveralls-report': { - cmd: - 'cat test/coverage/reports/lcov/lcov.info | ./node_modules/coveralls/bin/coveralls.js || true', - }, server: 'node server', suit_build: { cwd: './src/shared',