From 70d10792acf379619515047a904a2e61c4e767a0 Mon Sep 17 00:00:00 2001 From: Veeck Date: Sat, 10 Jul 2021 20:15:35 +0200 Subject: [PATCH] Transition to Github Actions (#2658) * Delete .travis.yml * Try again to create Github Actions * Remove global? Seems to cause problems * Try to add Windows support * Remove AppVeyor as GA replaces it :( * Change README * Remove specific branch (to help the renaming) * Update node versions * Remove appveyor from legacy grunt (to see if github doesnt complain) * Update README * Update dependencies * Update testing actions Co-authored-by: Markel F --- .github/workflows/testing.yml | 26 ++++++++++++++++++ .travis.yml | 21 -------------- README.md | 5 ++-- appveyor.yml | 24 ---------------- legacy/Gruntfile.js | 4 +-- package-lock.json | 52 +++++++++++++++++------------------ package.json | 2 +- 7 files changed, 56 insertions(+), 78 deletions(-) create mode 100644 .github/workflows/testing.yml delete mode 100644 .travis.yml delete mode 100644 appveyor.yml diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml new file mode 100644 index 00000000..2c38141f --- /dev/null +++ b/.github/workflows/testing.yml @@ -0,0 +1,26 @@ +name: Testing + +on: [push, pull_request] + +jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] + node-version: [12.x, 14.x, 16.x] + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Installing Node ${{ matrix.node-version }} + uses: actions/setup-node@v2 + with: + node-version: ${{ matrix.node-version }} + - name: Installing dependencies + run: npm ci + - name: Installing gulp command line interface + run: npm install gulp-cli + - name: Testing Modernizr + run: npm test + - name: Sending Coverage + run: ./node_modules/.bin/nyc report --reporter=text-lcov | ./node_modules/.bin/codecov --pipe diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 62f0b9a3..00000000 --- a/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -os: linux -dist: xenial -language: node_js -node_js: - - 12 - - 14 - - 16 -before_install: - - npm install -g npm@latest -before_script: - - | - if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(.md)' - then - echo "Only doc files were updated, not running the CI." - exit - fi - - npm install -g gulp-cli -after_success: - - ./node_modules/.bin/nyc report --reporter=text-lcov | ./node_modules/.bin/codecov --pipe -script: - - npm test diff --git a/README.md b/README.md index 28edc664..4c6a450d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # Modernizr [![npm version](https://badge.fury.io/js/modernizr.svg)](https://badge.fury.io/js/modernizr) -[![Build Status](https://api.travis-ci.org/Modernizr/Modernizr.svg?branch=master)](https://travis-ci.org/Modernizr/Modernizr) -[![Build Status](https://ci.appveyor.com/api/projects/status/github/Modernizr/modernizr?branch=master&svg=true)](https://ci.appveyor.com/project/rejas/modernizr) +[![Build Status](https://github.com/Modernizr/Modernizr/workflows/Testing/badge.svg)](https://github.com/Modernizr/Modernizr/actions) [![codecov](https://codecov.io/gh/Modernizr/Modernizr/branch/master/graph/badge.svg)](https://codecov.io/gh/Modernizr/Modernizr) [![Inline docs](https://inch-ci.org/github/Modernizr/Modernizr.svg?branch=master)](https://inch-ci.org/github/Modernizr/Modernizr) @@ -19,7 +18,7 @@ Modernizr tests which native CSS3 and HTML5 features are available in the curren ## Breaking changes with v4 -- Dropped Node 8 Support, please upgrade to Node v10 +- Dropped Node 10 Support, please upgrade to Node v12 - Following tests got renamed: diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index ef512044..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,24 +0,0 @@ -environment: - matrix: - - nodejs_version: 12 - - nodejs_version: 14 - - nodejs_version: 16 - -install: - - ps: Install-Product node $env:nodejs_version x64 - - npm install - -build: off - -before_test: - - npm install -g gulp-cli - -# Skipping specific commit files: https://www.appveyor.com/docs/appveyor-yml and https://www.appveyor.com/docs/how-to/filtering-commits -skip_commits: - files: - - '**/*.md' - -test_script: - - node --version - - npm --version - - npm test diff --git a/legacy/Gruntfile.js b/legacy/Gruntfile.js index 9b4e79cf..5a0c47c3 100644 --- a/legacy/Gruntfile.js +++ b/legacy/Gruntfile.js @@ -248,9 +248,7 @@ module.exports = function(grunt) { */ var tests = ['clean', 'eslint', 'pug', 'instrument', 'env:coverage', 'nodeTests']; - if (process.env.APPVEYOR) { - grunt.registerTask('test', tests); - } else if (process.env.BROWSER_COVERAGE !== 'true') { + if (process.env.BROWSER_COVERAGE !== 'true') { grunt.registerTask('test', tests.concat(['generate', 'browserTests'])); } else { grunt.registerTask('test', tests.concat(['generate', 'storeCoverage', 'browserTests', 'saucelabs-custom', 'makeReport', 'coveralls'])); diff --git a/package-lock.json b/package-lock.json index 0406aeb2..e3454728 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "codecov": "^3.8.2", "del": "^6.0.0", "eslint": "^7.30.0", - "eslint-plugin-jsdoc": "^35.4.2", + "eslint-plugin-jsdoc": "^35.4.3", "find-parent-dir": "^0.3.1", "fs-extra": "^10.0.0", "globby": "^11.0.4", @@ -1646,17 +1646,17 @@ } }, "node_modules/@es-joy/jsdoccomment": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.8.0.tgz", - "integrity": "sha512-Xd3GzYsL2sz2pcdtYt5Q0Wz1ol/o9Nt2UQL4nFPDcaEomvPmwjJsbjkKx1SKhl2h3TgwazNBLdcNr2m0UiGiFA==", + "version": "0.9.0-alpha.1", + "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.9.0-alpha.1.tgz", + "integrity": "sha512-Clxxc0PwpISoYYBibA+1L2qFJ7gvFVhI2Hos87S06K+Q0cXdOhZQJNKWuaQGPAeHjZEuUB/YoWOfwjuF2wirqA==", "dev": true, "dependencies": { - "comment-parser": "^1.1.5", + "comment-parser": "1.1.6-beta.0", "esquery": "^1.4.0", "jsdoc-type-pratt-parser": "1.0.4" }, "engines": { - "node": ">=10.0.0" + "node": ">=12.0.0" } }, "node_modules/@eslint/eslintrc": { @@ -3270,9 +3270,9 @@ } }, "node_modules/comment-parser": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.5.tgz", - "integrity": "sha512-RePCE4leIhBlmrqiYTvaqEeGYg7qpSl4etaIabKtdOQVi+mSTIBBklGUwIr79GXYnl3LpMwmDw4KeR2stNc6FA==", + "version": "1.1.6-beta.0", + "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.6-beta.0.tgz", + "integrity": "sha512-q3cA8TSMyqW7wcPSYWzbO/rMahnXgzs4SLG/UIWXdEsnXTFPZkEkWAdNgPiHig2OzxgpPLOh4WwsmClDxndwHw==", "dev": true, "engines": { "node": ">= 10.0.0" @@ -3966,13 +3966,13 @@ } }, "node_modules/eslint-plugin-jsdoc": { - "version": "35.4.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-35.4.2.tgz", - "integrity": "sha512-Ls6a1DDWS0XHx0ZH9iMaHNy/HltQseG2kO0S0xlaS1vataPSPjGpv2vSdQUAHnvwpH75VfNad6OvlLCfKalL+w==", + "version": "35.4.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-35.4.3.tgz", + "integrity": "sha512-hBEn+VNjVX0IKoZ2OdZs0Z1fU8CqZkBSzLqD8ZpwZEamrdi2TUgKvujvETe8gXYQ/67hpRtbR5iPFTgmWpRevw==", "dev": true, "dependencies": { - "@es-joy/jsdoccomment": "^0.8.0", - "comment-parser": "1.1.5", + "@es-joy/jsdoccomment": "^0.9.0-alpha.1", + "comment-parser": "1.1.6-beta.0", "debug": "^4.3.2", "esquery": "^1.4.0", "jsdoc-type-pratt-parser": "^1.0.4", @@ -13921,12 +13921,12 @@ } }, "@es-joy/jsdoccomment": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.8.0.tgz", - "integrity": "sha512-Xd3GzYsL2sz2pcdtYt5Q0Wz1ol/o9Nt2UQL4nFPDcaEomvPmwjJsbjkKx1SKhl2h3TgwazNBLdcNr2m0UiGiFA==", + "version": "0.9.0-alpha.1", + "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.9.0-alpha.1.tgz", + "integrity": "sha512-Clxxc0PwpISoYYBibA+1L2qFJ7gvFVhI2Hos87S06K+Q0cXdOhZQJNKWuaQGPAeHjZEuUB/YoWOfwjuF2wirqA==", "dev": true, "requires": { - "comment-parser": "^1.1.5", + "comment-parser": "1.1.6-beta.0", "esquery": "^1.4.0", "jsdoc-type-pratt-parser": "1.0.4" } @@ -15241,9 +15241,9 @@ "dev": true }, "comment-parser": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.5.tgz", - "integrity": "sha512-RePCE4leIhBlmrqiYTvaqEeGYg7qpSl4etaIabKtdOQVi+mSTIBBklGUwIr79GXYnl3LpMwmDw4KeR2stNc6FA==", + "version": "1.1.6-beta.0", + "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.6-beta.0.tgz", + "integrity": "sha512-q3cA8TSMyqW7wcPSYWzbO/rMahnXgzs4SLG/UIWXdEsnXTFPZkEkWAdNgPiHig2OzxgpPLOh4WwsmClDxndwHw==", "dev": true }, "commondir": { @@ -16125,13 +16125,13 @@ } }, "eslint-plugin-jsdoc": { - "version": "35.4.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-35.4.2.tgz", - "integrity": "sha512-Ls6a1DDWS0XHx0ZH9iMaHNy/HltQseG2kO0S0xlaS1vataPSPjGpv2vSdQUAHnvwpH75VfNad6OvlLCfKalL+w==", + "version": "35.4.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-35.4.3.tgz", + "integrity": "sha512-hBEn+VNjVX0IKoZ2OdZs0Z1fU8CqZkBSzLqD8ZpwZEamrdi2TUgKvujvETe8gXYQ/67hpRtbR5iPFTgmWpRevw==", "dev": true, "requires": { - "@es-joy/jsdoccomment": "^0.8.0", - "comment-parser": "1.1.5", + "@es-joy/jsdoccomment": "^0.9.0-alpha.1", + "comment-parser": "1.1.6-beta.0", "debug": "^4.3.2", "esquery": "^1.4.0", "jsdoc-type-pratt-parser": "^1.0.4", diff --git a/package.json b/package.json index 642ca368..cd452769 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "codecov": "^3.8.2", "del": "^6.0.0", "eslint": "^7.30.0", - "eslint-plugin-jsdoc": "^35.4.2", + "eslint-plugin-jsdoc": "^35.4.3", "find-parent-dir": "^0.3.1", "fs-extra": "^10.0.0", "globby": "^11.0.4",