Merge pull request #211 from stronk7/remove_old_npm_stuff_forever

Remove old npm stuff forever

Author: stronk7

.travis.yml

@@ -1,7 +1,7 @@
 language: php
 
 os: linux
-dist: xenial
+dist: focal
 
 addons:
   apt:
@@ -10,13 +10,16 @@ addons:
 
 cache:
   directories:
-      - $HOME/cachedir
+    - $HOME/cachedir
 
 services:
   - mysql
 
 php:
-    - 7.4
+  - 7.4
+
+node:
+  - 16
 
 env:
     - TEST_SUITE="0-*"
@@ -29,10 +32,10 @@ before_install:
 
 install:
   - git clone --depth 1 https://github.com/bats-core/bats-core.git $HOME/bats-core
-  - nvm install 8.9
-  - nvm use 8.9
+  # Install local_ci own dependencies
   - travis_retry composer install
-  - npm install
+  - travis_retry npm install
+  # Performance for MySQL.
   - echo -e "[server]\ninnodb_flush_log_at_trx_commit=0" | sudo tee -a /etc/mysql/my.cnf # General speed bump.
   # Move MySQL data to tmpfs (see core travis). Without that we get random timeouts here and there.
   - sudo mkdir /mnt/ramdisk

grunt_process/grunt_process.sh

@@ -35,7 +35,7 @@ rm -fr ${outputfile}.stderr
 # Prepare all the npm stuff if needed
 # (only if the job is in charge of handling it, aka, $npminstall was passed
 if [[ -n ${npminstall} ]]; then
-    . ${mydir}/../prepare_npm_stuff/prepare_npm_stuff.sh
+    source ${mydir}/../prepare_npm_stuff/prepare_npm_stuff.sh
 fi
 
 # Ensure we have grunt cli available before continue.

php_lint/php_lint.sh

@@ -62,7 +62,9 @@ for mfile in ${mfiles} ; do
         fullpath=$gitdir/$mfile
 
         if [ -e $fullpath ] ; then
-            if LINTERRORS=$(($phpcmd -l $fullpath >/dev/null) 2>&1)
+            # We have to ensure that error_log is not set because it makes the
+            # CLI to add blank lines to output. Crazy but true.
+            if LINTERRORS=$(($phpcmd -d error_log= -l $fullpath >/dev/null) 2>&1)
             then
                 echo "$fullpath - OK"
             else

rebase_security/rebase_security.sh

@@ -185,7 +185,7 @@ then
     loops=0
 
     # Ensure (gruntcmd or (recesscmd and shiftercmd)) are available (depends on $gitbranch)
-    . ${mydir}/../prepare_npm_stuff/prepare_npm_stuff.sh
+    source ${mydir}/../prepare_npm_stuff/prepare_npm_stuff.sh
 
     fix_conflict
     until $gitcmd rebase --continue; do

remote_branch_checker/lib.php

@@ -90,9 +90,8 @@ public function run($format, $patchset) {
             }
         }
 
-        // For the 'js coding style problems section', conditionally use eslint or jshint
         if (file_exists($this->directory . '/eslint.xml')) {
-            // Process the jshint output, weighting errors with 5 and warnings with 1
+            // Process the eslint output, weighting errors with 5 and warnings with 1
             $params = array(
                 'title' => 'Javascript coding style problems',
                 'abbr' => 'js',
@@ -107,22 +106,6 @@ public function run($format, $patchset) {
                     $smurf->appendChild($snode);
                 }
             }
-        } else {
-            // Process the jshint output, weighting errors with 5 and warnings with 1
-            $params = array(
-                'title' => 'Javascript coding style problems',
-                'abbr' => 'js',
-                'description' => 'This section shows the coding style problems detected in the code by jshint',
-                'url' => 'https://docs.moodle.org/dev/Javascript/Coding_style',
-                'codedir' => dirname($this->directory) . '/',
-                'errorweight' => 5,
-                'warningweight' => 1);
-            if ($node = $this->apply_xslt($params, $this->directory . '/jshint.xml', 'checkstyle2smurf.xsl')) {
-                if ($check = $node->getElementsByTagName('check')->item(0)) {
-                    $snode = $doc->importNode($check, true);
-                    $smurf->appendChild($snode);
-                }
-            }
         }
 
         if (file_exists($this->directory . '/stylelint.xml')) {
@@ -141,22 +124,6 @@ public function run($format, $patchset) {
                     $smurf->appendChild($snode);
                 }
             }
-        } else {
-            // Process the csslint output, weighting errors with 5 and warnings with 1
-            $params = array(
-                'title' => 'CSS problems',
-                'abbr' => 'css',
-                'description' => 'This section shows CSS problems detected by csslint',
-                'url' => 'https://github.com/CSSLint/csslint/wiki/Rules', //TODO: MDLSITE-1796 Create CSS guidelines and link them here.
-                'codedir' => dirname($this->directory) . '/',
-                'errorweight' => 5,
-                'warningweight' => 1);
-            if ($node = $this->apply_xslt($params, $this->directory . '/csslint.xml', 'checkstyle2smurf.xsl')) {
-                if ($check = $node->getElementsByTagName('check')->item(0)) {
-                    $snode = $doc->importNode($check, true);
-                    $smurf->appendChild($snode);
-                }
-            }
         }
 
         // Process the docs output, weighting errors with 3 and warnings with 1

remote_branch_checker/remote_branch_checker.sh

@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 # $gitcmd: Path to git executable.
 # $phpcmd: Path to php executable.
-# $jshintcmd: Path to jshint executable.
-# $csslintcmd: Path to csslint executable.
 # $remote: Remote repo where the branch to check resides.
 # $branch: Remote branch we are going to check.
 # $integrateto: Local branch where the remote branch is going to be integrated.
@@ -22,7 +20,7 @@ set +x
 set -e
 
 # Verify everything is set
-required="WORKSPACE gitcmd phpcmd jshintcmd csslintcmd remote branch integrateto issue"
+required="WORKSPACE gitcmd phpcmd remote branch integrateto issue"
 for var in ${required}; do
     if [ -z "${!var}" ]; then
         echo "Error: ${var} environment variable is not defined. See the script comments."
@@ -287,8 +285,6 @@ echo "${WORKSPACE}/version.php" >> ${WORKSPACE}/work/patchset.files
 echo "${WORKSPACE}/config-dist.php" >> ${WORKSPACE}/work/patchset.files
 
 # Add linting config files to patchset files to avoid it being deleted for use later..
-echo '.jshint' >> ${WORKSPACE}/work/patchset.files
-echo '.csslintrc' >> ${WORKSPACE}/work/patchset.files
 echo '.eslintrc' >> ${WORKSPACE}/work/patchset.files
 echo '.eslintignore' >> ${WORKSPACE}/work/patchset.files
 echo '.stylelintrc' >> ${WORKSPACE}/work/patchset.files
@@ -300,7 +296,7 @@ echo "Info: Calculating excluded files"
 
 echo "Info: Preparing npm"
 # Everything is ready, let's install all the required node stuff that some tools will use.
-. ${mydir}/../prepare_npm_stuff/prepare_npm_stuff.sh >> "${WORKSPACE}/work/prepare_npm.txt" 2>&1
+source ${mydir}/../prepare_npm_stuff/prepare_npm_stuff.sh >> "${WORKSPACE}/work/prepare_npm.txt" 2>&1
 
 # Before deleting all the files not part of the patchest we calculate the
 # complete list of valid components (plugins, subplugins and subsystems)
@@ -514,43 +510,6 @@ else
         --path=${WORKSPACE} --format=xml --componentsfile="${WORKSPACE}/work/valid_components.txt" > "${WORKSPACE}/work/docs.xml"
 fi
 
-# Exclude build directories from the results (e.g. lib/yui/build, lib/amd/build/)
-find $WORKSPACE -type d -path \*/build | sed "s|$WORKSPACE/||" > $WORKSPACE/.jshintignore
-
-# Run jshint if we haven't got eslint results
-if [ ! -f  "${WORKSPACE}/work/eslint.xml" ]; then
-    echo "Info: Running jshint..."
-    ${jshintcmd} --config $WORKSPACE/.jshintrc --exclude-path $WORKSPACE/.jshintignore \
-        --reporter=checkstyle ${WORKSPACE} > "${WORKSPACE}/work/jshint.xml"
-fi
-
-# Run csslint if we haven't got stylelint results
-if [ ! -f  "${WORKSPACE}/work/stylelint.xml" ]; then
-    echo "Info: Running csslint..."
-    if [ ! -f ${WORKSPACE}/.csslintrc ]; then
-        echo "csslintrc file not found, defaulting to error checking only"
-        echo '--errors=errors' > ${WORKSPACE}/.csslintrc
-        echo '--exclude-list=vendor/,lib/editor/tinymce/,lib/yuilib/,theme/bootstrapbase/style/' >> ${WORKSPACE}/.csslintrc
-    fi
-
-    ${csslintcmd} --format=checkstyle-xml --quiet ${WORKSPACE} > "${WORKSPACE}/work/csslint.out"
-    # Unfortunately csslint doesn't give us decent error codes.. so we have to grep:
-    if grep -q '<?xml' ${WORKSPACE}/work/csslint.out
-    then
-        echo "Info: csslint check completed."
-        mv ${WORKSPACE}/work/csslint.out ${WORKSPACE}/work/csslint.xml
-    elif grep -q 'No files specified.' ${WORKSPACE}/work/csslint.out
-    then
-        echo "Info: No checkable CSS files detected in patchset."
-        echo $emptycheckstyle > "${WORKSPACE}/work/csslint.xml"
-    else
-        echo "Error: Unknown csslint error occured. See csslint.out" >> ${errorfile}
-        echo 'csslint exited with error:'
-        cat ${WORKSPACE}/work/csslint.out
-        exit 1
-    fi
-fi
-
 # ########## ########## ########## ##########
 
 # Everything has been generated in the work directory, generate the report, observing $filtering

tests/1-compare_databases.bats

@@ -107,9 +107,9 @@ setup () {
     assert_output --partial 'Column status of table enrol_lti_app_registration difference found in has_default: true !== false'
     assert_output --partial 'Column status of table enrol_lti_app_registration difference found in default_value: 0 !== null'
     assert_output --partial 'Column hidden of table grade_categories difference found in type: tinyint !== bigint'
-    assert_output --partial 'Column hidden of table grade_categories difference found in max_length: 2 !== 18'
+    assert_output --regexp 'Column hidden of table grade_categories difference found in max_length: 2 !== 1[89]'
     assert_output --partial 'Column hidden of table grade_categories_history difference found in type: tinyint !== bigint'
-    assert_output --partial 'Column hidden of table grade_categories_history difference found in max_length: 2 !== 18'
+    assert_output --regexp 'Column hidden of table grade_categories_history difference found in max_length: 2 !== 1[89]'
     assert_output --partial 'Error: Problem comparing databases ci_installed_'
     assert_output --partial 'Error: Process ended with 1 errors'
     refute_output --partial 'Ok: Process ended without errors'

tests/1-grunt_process.bats

@@ -3,7 +3,7 @@
 load libs/shared_setup
 
 setup () {
-    create_git_branch MOODLE_32_STABLE v3.2.6
+    create_git_branch MOODLE_39_STABLE v3.9.0
 
     export npminstall=1
 }
@@ -15,9 +15,9 @@ setup () {
     assert_output --partial "OK: All modules are perfectly processed by grunt"
 }
 
-@test "grunt_process: Uncommited .less change" {
-    # Create less change
-    git_apply_fixture 32-grunt-less-unbuilt.patch
+@test "grunt_process: Uncommited .scss change" {
+    # Create scss change
+    git_apply_fixture 39-grunt-scss-unbuilt.patch
 
     # Run test
     ci_run grunt_process/grunt_process.sh
@@ -26,12 +26,12 @@ setup () {
     assert_failure
     assert_output --partial "Done." # Grunt shouldn't have an issue here.
     assert_output --partial "WARN: Some modules are not properly processed by grunt. Changes detected:"
-    assert_output --regexp "GRUNT-CHANGE: (.*)/theme/bootstrapbase/style/moodle.css"
+    assert_output --regexp "GRUNT-CHANGE: (.*)/theme/boost/style/moodle.css"
 }
 
 @test "grunt_process: Uncommited .js change" {
     # Create js change.
-    git_apply_fixture 32-grunt-js-unbuilt.patch
+    git_apply_fixture 39-grunt-js-unbuilt.patch
 
     # Run test
     ci_run grunt_process/grunt_process.sh

tests/2-remote_branch_checker.bats

@@ -2,29 +2,9 @@
 
 load libs/shared_setup
 
-# TODO: we will get rid of these depencies soon.
-prepare_prechecker_npmbins () {
-    npmglobals=$LOCAL_CI_TESTS_CACHEDIR/prechecker_npmglobals
-
-    mkdir -p $npmglobals
-    cd $npmglobals
-
-    export csslintcmd=$npmglobals/node_modules/.bin/csslint
-    if [[ ! -f $csslintcmd ]]; then
-        npm --silent install csslint
-    fi
-
-    export jshintcmd=$npmglobals/node_modules/.bin/jshint
-    if [[ ! -f $jshintcmd ]]; then
-        npm --silent install jshint
-    fi
-    cd $OLDPWD
-}
-
 setup () {
-    prepare_prechecker_npmbins
-
-    create_git_branch MOODLE_34_STABLE v3.4.0 # Must be always a .0 version coz we precheck it in master.
+    # This was the first .0 version coming with .nvmrc file, so it's the minimum supported by local_ci.
+    create_git_branch MOODLE_38_STABLE v3.8.0 # Must be always a .0 version coz we precheck it in master.
     export WORKSPACE=$gitdir
     export phpcsstandard=$LOCAL_CI_TESTS_PHPCS_DIR
 }
@@ -53,70 +33,69 @@ assert_prechecker () {
 
 @test "remote_branch_checker/remote_branch_checker.sh: old branch failing" {
     # An extremely old branch running jshint..
-    assert_prechecker local_ci_fixture_oldbranch MDLSITE-3899 b3f5865eabbbdd439ac7f2ec763046f2ac7f0b37
+    assert_prechecker local_ci_fixture_oldbranch MDLSITE-3899 v2.9.0-rc1
 }
 
 @test "remote_branch_checker/remote_branch_checker.sh: all possible checks failing" {
     # A branch with a good number of errors
-    assert_prechecker local_ci_fixture_manyproblems MDL-53136 665c3ac59c35b7387a4fc70b8ac6600ce9ffeb87
+    assert_prechecker local_ci_fixture_manyproblems_38 MDL-53136 v3.8.0
 }
 
 @test "remote_branch_checker/remote_branch_checker.sh: all checks passing" {
-    # from https://integration.moodle.org/job/Precheck%20remote%20branch/25996/
-    assert_prechecker MDL-53572-master-8ce58c9 MDL-53572 665c3ac59c35b7387a4fc70b8ac6600ce9ffeb87
+    assert_prechecker local_ci_fixture_all_passing MDL-53572 v3.9.0
 }
 
 @test "remote_branch_checker/remote_branch_checker.sh: stylelint checks" {
-    assert_prechecker prechecker-fixture-stylelint MDL-12345 665c3ac59c35b7387a4fc70b8ac6600ce9ffeb87
+    assert_prechecker local_ci_fixture_stylelint MDL-12345 v3.9.0
 }
 
 @test "remote_branch_checker/remote_branch_checker.sh: all results reported despite no php/js/css files" {
     # Ensure we always report each section, even if there are no php/css/js files to check
-    assert_prechecker fixture-non-code-update MDL-12345 665c3ac59c35b7387a4fc70b8ac6600ce9ffeb87
+    assert_prechecker local_ci_fixture_noncode_update MDL-12345 v3.9.0
 }
 
 @test "remote_branch_checker/remote_branch_checker.sh: thirdparty css modification" {
-    # Ensure stylelint doesn't complain about the third party css, but thirdpart does
+    # Ensure stylelint doesn't complain about the third party css, but thirdparty does
     # TODO: thirdparty check bug with reporting same file twice..
-    assert_prechecker fixture-thirdparty-css MDL-12345 665c3ac59c35b7387a4fc70b8ac6600ce9ffeb87
+    assert_prechecker local_ci_fixture_thirdparty_css MDL-12345 v3.9.0
 }
 
 @test "remote_branch_checker/remote_branch_checker.sh: upgrade external backup" {
-    assert_prechecker local_ci_fixture_upgrade_external_backup MDL-12345 c69c33b14d9fb83ca22bde558169e36b5e1047cf
+    assert_prechecker local_ci_fixture_upgrade_external_backup MDL-12345 v4.0.0
 }
 
 @test "remote_branch_checker/remote_branch_checker.sh: upgrade external backup skipped for plugins" {
     # With branches named PLUGIN-xxxx, the upgrade_external_backup check will be skipped,
     # no matter the verified branch has 3 warnings when running for non plugins.
-    assert_prechecker local_ci_fixture_upgrade_external_backup_skipped_for_plugins PLUGIN-12345 c69c33b14d9fb83ca22bde558169e36b5e1047cf
+    assert_prechecker local_ci_fixture_upgrade_external_backup_skipped_for_plugins PLUGIN-12345 v4.0.0
 }
 
 @test "remote_branch_checker/remote_branch_checker.sh: phpcs aware of all components" {
     assert_prechecker local_ci_fixture_phpcs_aware_components MDL-12345 c69c33b14d9fb83ca22bde558169e36b5e1047cf
 }
 
 @test "remote_branch_checker/remote_branch_checker.sh: bad amos script" {
-    assert_prechecker fixture-bad-amos-commands MDL-12345 665c3ac59c35b7387a4fc70b8ac6600ce9ffeb87
+    assert_prechecker local_ci_fixture_bad_amos_command MDL-12345 v3.9.0
 }
 
 @test "remote_branch_checker/remote_branch_checker.sh: good amos commands" {
-    assert_prechecker fixture-good-amos-commit MDL-12345 665c3ac59c35b7387a4fc70b8ac6600ce9ffeb87
+    assert_prechecker local_ci_fixture_good_amos_commit MDL-12345 v3.9.0
 }
 
 @test "remote_branch_checker/remote_branch_checker.sh: mustache lint" {
-    assert_prechecker fixture-mustache-lint MDL-12345 665c3ac59c35b7387a4fc70b8ac6600ce9ffeb87
+    assert_prechecker local_ci_fixture_mustache_lint MDL-12345 v3.9.0
 }
 
 @test "remote_branch_checker/remote_branch_checker.sh: mustache lint eslint problem" {
-    assert_prechecker fixture-mustache-lint-js MDL-12345 665c3ac59c35b7387a4fc70b8ac6600ce9ffeb87
+    assert_prechecker local_ci_fixture_mustache_lint_js MDL-12345 v3.9.0
 }
 
 @test "remote_branch_checker/remote_branch_checker.sh: gherkin lint" {
-    assert_prechecker fixture-gherkin-lint MDL-12345 f968cd44e8ee5d54b1bc56823040ff770dbf18af
+    assert_prechecker local_ci_fixture_gherkin_lint MDL-12345 v3.9.0
 }
 
 @test "remote_branch_checker/remote_branch_checker.sh: grunt build failed" {
-    assert_prechecker fixture-grunt-build-failed MDL-12345 665c3ac59c35b7387a4fc70b8ac6600ce9ffeb87
+    assert_prechecker local_ci_fixture_grunt_build_failed MDL-12345 v3.9.0
 }
 
 @test "remote_branch_checker/remote_branch_checker.sh: remote which doesnt exist" {