build: improve cordova-js version ID in built file #230
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
This comment has been minimized.
This comment has been minimized.
raphinesse
force-pushed
the
better-build-id
branch
from
297dced
to
1df0942
Compare
timbru31
approved these changes
Sep 19, 2020
- uses `git describe` instead of `git rev-parse HEAD` - fallback to version from package.json if not in a cordova-js repo - rename and factor out buildId
raphinesse
force-pushed
the
better-build-id
branch
from
1df0942
to
b49e90b
Compare
Codecov Report
@@ Coverage Diff @@
## master #230 +/- ##
=======================================
Coverage 84.23% 84.23%
=======================================
Files 14 14
Lines 539 539
=======================================
Hits 454 454
Misses 85 85 Continue to review full report at Codecov.
|
|
Since the second pair of eyes never came I'm just going to merge this now 😉 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation and Context
Currently the SHA of the commit pointed to by
HEADis included in the builtcordova.jsfile to identify the version ofcordova-jsused to build it. If platforms depend oncordova-jsin the future (see #169 & #229), they will most likely depend on published packages. Consequently there will be nocordova-jsrepo to get aforementioned information from.To make things worse, git will automatically use a repo in any parent dir. So if you have
cordova-android/containing.git/andnode_modules/cordova-js/, the old implementation would use the HEAD ofcordova-android/.git/to describecordova-js.Thus, we now include the version from
package.jsoninstead in that case.Description
git describeinstead ofgit rev-parse HEADif in acordova-jsrepocordova-jsrepobuild-idTesting
Manually tested both cases.