mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-24 15:08:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: replace all master to main

Browse source
This commit is contained in:
Anh Hồng 2021-04-19 09:51:20 +07:00
parent 4148f0b846
commit b7ac2851c6
55 changed files with 431 additions and 455 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gulpfile.js
View file

@ -30,7 +30,7 @@ var indexFile = readFileSync('src/template.index.html').toString();
var indexTemplate = _.template(indexFile);
var compliments = [
'Thanks to Hongarc for the modern and amazing gulp workflow!',
'Thanks to Hong4rc for the modern and amazing gulp workflow!',
'I hope you all have a great day :)'
];
var compliment = (done) => {
@ -157,8 +157,8 @@ var gitAdd = function(done) {
done();
};
var gitDeployMergeMaster = function(done) {
execSync('git checkout gh-pages && git merge master -m "merge master"');
var gitDeployMergeMain = function(done) {
execSync('git checkout gh-pages && git merge main -m "merge main"');
done();
};
@ -166,7 +166,7 @@ var gitDeployPushOrigin = function(done) {
execSync('git commit -am "rebuild for prod"; ' +
'git push origin gh-pages --force && ' +
'git branch -f trunk gh-pages && ' +
'git checkout master'
'git checkout main'
);
done();
};
@ -184,7 +184,7 @@ var deploy = series(
clean,
jasmine,
jshint,
gitDeployMergeMaster,
gitDeployMergeMain,
build,
gitDeployPushOrigin,
compliment