Updated free git build

shopwp · Jan 30, 2019 · 98c1482 · 98c1482
1 parent a87e62f
commit 98c1482
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/gulp/config.js b/gulp/config.js
@@ -165,7 +165,7 @@ var config = {
     proTmp: '../../../../assets/wp-shopify-pro/_tmp',
     proTmpRenamed: '../../../../assets/wp-shopify-pro/wp-shopify-pro',
     free: '../../../../assets/wpshopify',
-    freeDistRepo: '../../../../assets/wpshopify/_free',
+    freeDistRepo: '../../../../assets/wpshopify',
     freeTmpRenamed: '../../../../assets/wpshopify/wpshopify',
     coreRepo: '../../../../assets/wp-core-repo/trunk',
     svgsPublic: isBuilding(argvs) ? './_tmp/public/imgs' : './public/imgs',

diff --git a/gulp/tasks/build.js b/gulp/tasks/build.js
@@ -518,7 +518,7 @@ gulp.task('build:pro', done => {
     'clean:free:repo', // Non-tmp -- Removes ./_free folder
     'build:git', // Non-tmp -- Runs our git flow process (add / commit, release start, release pub, release finish)
     'build:copyToTmp', // Tmp -- Copies all app files to _tmp folder
-    'build:preprocess', // Runs through preprocess code 
+    'build:preprocess', // Runs through preprocess code
     'build:rename:version', // Tmp -- Updates the version number within the main wp-shopify.php file and the config class
     'build:remove:testversion', // Tmp -- Ensures that the $new_version_number variable is commented out
     'build:assets', // Tmp
@@ -554,7 +554,7 @@ gulp.task('build:free', done => {
     'build:assets',
     'build:free:repo:clone', // clones the free repo into the _free folder
     'build:free:repo:copy', // copies the files inside _tmp (which we just processed) into the _free folder
-    // 'build:free:repo:move',
+    'build:free:repo:move'
     // 'build:git', // Runs our git flow process (add / commit, release start, release pub, release finish)
     // 'build:free:copy:readme', // copies the core repo readme to the wpshopify/wpshopify folder
     // 'build:free:mergeWithCore', // merges _free files / folders with the wp-core folder in assets

diff --git a/gulp/tasks/build/git.js b/gulp/tasks/build/git.js
@@ -11,7 +11,7 @@ function gitOptions() {
 
   return {
     newVersionNumber: config.buildRelease,
-    gitFolder: config.isPro ? config.folders.plugin : config.folders.freeDistRepo,
+    gitFolder: config.isPro ? config.folders.plugin : config.folders.free,
     repoFiles: config.isPro ? config.files.proRepoFiles : config.files.freeRepoFiles
   }
 
@@ -26,7 +26,9 @@ Git flow release start
 gulp.task('build:git:release:start', done => {
 
   const options = gitOptions();
+
   console.log('options.gitFolder', options.gitFolder);
+
   return gulp
     .src(options.gitFolder, { base: "./" })
     .pipe( shell([