Merge pull request #317 from whitesmith/fix-ci

Fix the CI
whitesmith · Mar 8, 2021 · 0121229 · 0121229
2 parents bd907d0 + b8a3c4a
commit 0121229
Show file tree

Hide file tree

Showing 4 changed files with 7,691 additions and 24 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -33,11 +33,11 @@ jobs:
           command: |
             set +e
             touch $BASH_ENV
-            curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.5/install.sh | bash
+            curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.37.2/install.sh | bash
             echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV
             echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
-            echo 'nvm install v6.2.2' >> $BASH_ENV
-            echo 'nvm alias default v6.2.2' >> $BASH_ENV
+            echo 'nvm install v14.16.0' >> $BASH_ENV
+            echo 'nvm alias default v14.16.0' >> $BASH_ENV
       - run:
           command: |
             npm install gulp-cli -g

diff --git a/Gulpfile.js b/Gulpfile.js
@@ -14,7 +14,7 @@
 
 /* Gulp dependencies */
 var gulp = require('gulp');
-var runSequence = require('run-sequence');
+var runSequence = require('gulp4-run-sequence');
 var gutil = require('gulp-util');
 var del = require('del');
 var gulpif = require('gulp-if');
@@ -58,16 +58,16 @@ var tasks = {};
 
 tasks.browser_sync = function () {
   var config = {
-      proxy: {
-          target: "http://localhost:8000",
-          ws: true
-      },
-      ghostMode: {
-        clicks: false,
-        location: false,
-        forms: false,
-        scroll: false
-      }
+    proxy: {
+      target: "http://localhost:8000",
+      ws: true
+    },
+    ghostMode: {
+      clicks: false,
+      location: false,
+      forms: false,
+      scroll: false
+    }
   };
 
   browserSync(config);
@@ -97,7 +97,7 @@ tasks.sass = function () {
       loadMaps: true
     })))
     /* Autoprefixer */
-   .pipe(autoprefixer({
+    .pipe(autoprefixer({
       browsers: ['last 2 versions'],
     }))
     /* We don't serve the source files,
@@ -117,9 +117,9 @@ gulp.task('sass', tasks.sass);
 /* Assets compilation and reload. */
 gulp.task('browser-sync', tasks.browser_sync);
 var browserSyncRefresh = browserSync.reload.bind(browserSync);
-var browserSyncStream  = function () { browserSync.reload({ stream: true }); };
+var browserSyncStream = function () { browserSync.reload({ stream: true }); };
 
-gulp.task('reload-sass', ['sass'], browserSyncStream);
+gulp.task('reload-sass', gulp.series('sass'), browserSyncStream);
 
 /* Watch task */
 gulp.task('watch', function (cb) {
@@ -141,9 +141,9 @@ gulp.task('build', function (cb) {
   /* Clean first, build afterwards. */
   return runSequence(
     'clean', [
-      'sass',
-    ], cb);
+    'sass',
+  ], cb);
 });
 
 /* Default task (`watch`) */
-gulp.task('default', ['watch']);
+gulp.task('default', gulp.series('watch'));