This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
jacogr
commented
Dec 7, 2016
- Build process changed, leaving old filed handing around on js-precompiled
- Move new files out of the way, cleanup old, move new back
arkpar
reviewed
Dec 7, 2016
@@ -34,11 +34,16 @@ git fetch origin 2>$GITLOG | |||
git checkout -b $BRANCH | |||
|
|||
echo "*** Committing compiled files for $UTCDATE" | |||
mv build ../build.new | |||
git pull origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]" | |||
git rm build/*.* |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggest using *
instead of *.*
. Some files might not have a dot in the name.
Changes Unknown when pulling e8a67da on jg-js-precompiled into ** on master**. |
arkpar
reviewed
Dec 7, 2016
git pull origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]" | ||
git rm build/*.* | ||
git commit -m "$UTCDATE [rm]" | ||
cp -f ../build.new/*.* build/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mv
instead of cp
should be faster.
Changes Unknown when pulling e8a67da on jg-js-precompiled into ** on master**. |
Changes Unknown when pulling 4d72be7 on jg-js-precompiled into ** on master**. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.