diff options
| -rw-r--r-- | .github/workflows/node.js.yml | 28 | ||||
| -rw-r--r-- | Gruntfile.js | 21 |
2 files changed, 3 insertions, 46 deletions
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 468611c35..30e8583fe 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -133,31 +133,3 @@ jobs: - name: Test run: npm run test:unit -- -b safari --jquery ${{ matrix.JQUERY }} --retries 3 - - legacy-build: - runs-on: ubuntu-latest - name: Build on Node 10.x - env: - NODE_VERSION: 10.x - steps: - - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - - - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 - with: - node-version: ${{ env.NODE_VERSION }} - - - name: Cache - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 - with: - path: ~/.npm - key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock- - - - name: Install npm dependencies - run: npm install - - - name: Build - run: npm run build diff --git a/Gruntfile.js b/Gruntfile.js index b4933c766..ac61e3ad3 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -84,15 +84,6 @@ const htmllintBad = [ "tests/unit/tabs/data/test.html" ]; -const nodeV16OrNewer = !/^v1[0-5]\./.test( process.version ); - -// Support: Node.js <16 -// Skip running tasks that dropped support for Node.js 10-15 -// in this Node version. -function runIfNewNode( task ) { - return nodeV16OrNewer ? task : "print_old_node_message:" + task; -} - function mapMinFile( file ) { return "dist/" + file.replace( /ui\//, "minified/" ); } @@ -357,13 +348,7 @@ grunt.initConfig( { } ); // grunt plugins -require( "load-grunt-tasks" )( grunt, { - pattern: nodeV16OrNewer ? [ "grunt-*" ] : [ - "grunt-*", - "!grunt-eslint", - "!grunt-html" - ] -} ); +require( "load-grunt-tasks" )( grunt ); // local tasks grunt.loadTasks( "build/tasks" ); @@ -406,9 +391,9 @@ grunt.registerTask( "print_old_node_message", ( ...args ) => { // Keep this task list in sync with the testing steps in our GitHub action test workflow file! grunt.registerTask( "lint", [ "asciilint", - runIfNewNode( "eslint" ), + "eslint", "csslint", - runIfNewNode( "htmllint" ) + "htmllint" ] ); grunt.registerTask( "build", [ "requirejs", "concat" ] ); grunt.registerTask( "default", [ "lint", "build" ] ); |