Skip to content

Commit

Permalink
Development branch is now 8.4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
claudiu-cristea committed Feb 8, 2017
1 parent e49b0aa commit 0680b75
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -20,4 +20,5 @@ pip-log.txt
cores.db
app/data/company_infos.yml
app/data/company_mapping.yml
app/drupalcore
tmp/
4 changes: 2 additions & 2 deletions app/bin/build.sh
Expand Up @@ -5,10 +5,10 @@ git pull
echo "Updating Sub Repos"

if [ ! -d "./app/drupalcore" ]; then
git clone --branch 8.3.x http://git.drupal.org/project/drupal.git ./app/drupalcore
git clone --branch 8.4.x http://git.drupal.org/project/drupal.git ./app/drupalcore
else
cd ./app/drupalcore
git checkout 8.3.x
git checkout 8.4.x
git pull
cd ../bin
fi
Expand Down
2 changes: 1 addition & 1 deletion app/bin/json.rb
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby

log_args = ARGV[0] || '--since=2011-03-09'
git_command = 'git --git-dir=../drupalcore/.git --work-tree=drupal log 8.3.x ' + log_args + ' -s --format=%s'
git_command = 'git --git-dir=../drupalcore/.git --work-tree=drupal log 8.4.x ' + log_args + ' -s --format=%s'

Encoding.default_external = Encoding::UTF_8
require 'erb'
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
Expand Up @@ -38,7 +38,7 @@ gulp.task('drupalcore', function () {
var fs = require('fs');

return gulp.src('')
.pipe(gulpif(!fs.existsSync(paths.drupal), shell(['git clone --branch 8.3.x http://git.drupal.org/project/drupal.git ' + paths.drupal])))
.pipe(gulpif(!fs.existsSync(paths.drupal), shell(['git clone --branch 8.4.x http://git.drupal.org/project/drupal.git ' + paths.drupal])))
.pipe(shell(['git pull'],{ 'ignoreErrors': true, 'cwd': './app/drupalcore'}));
});

Expand Down

0 comments on commit 0680b75

Please sign in to comment.