Ensure style-spec is published with mapbox-gl #6586
Merged
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
|
cc @samanpwbb |
jfirebaugh
approved these changes
May 1, 2018
| @@ -141,13 +142,14 @@ | |||
| "test-suite": "run-s test-render test-query", | |||
| "test-suite-clean": "find test/integration/{render,query}-tests -mindepth 2 -type d -not \\( -exec test -e \"{}/style.json\" \\; \\) -print | xargs -t rm -r", | |||
| "test-unit": "build/run-tap --reporter classic --no-coverage test/unit", | |||
| "test-build": "build/run-tap --no-coverage test/build/**/*.test.js", | |||
There was a problem hiding this comment.
Does this get run in CI?
There was a problem hiding this comment.
Oops, good catch -- accidentally omitted the circle.yml change
| "build-css": "postcss -o dist/mapbox-gl.css src/css/mapbox-gl.css", | ||
| "build-style-spec": "cd src/style-spec && npm run build && cd ../.. && cp -R src/style-spec/dist dist/style-spec", |
There was a problem hiding this comment.
Any particular reason for npm rather than yarn?
There was a problem hiding this comment.
Nope, just habit, will change.
There was a problem hiding this comment.
Reverted to npm due to mapbox/mbgl-ci-images#17
anandthakker
commented
May 1, 2018
| @@ -131,6 +131,8 @@ jobs: | |||
| - run: yarn run build-min | |||
| - run: yarn run build-dev | |||
| - run: yarn run build-css | |||
| - run: yarn run build-style-spec | |||
| - run: yarn run test-build | |||
There was a problem hiding this comment.
@jfirebaugh do you see any reason to do test-build as a separate workflow step? I thought it kinda made sense to keep it here, but 🤷♂️
There was a problem hiding this comment.
No, adding it here is what I would have done too.
anandthakker
force-pushed
the
build-style-spec
branch
from
1a4541c to
b8c34aa
Compare
anandthakker
added a commit
that referenced
this pull request
May 3, 2018
Cherry pick 478dd56 from master * Ensure style spec is published with build Closes #6433 Closes #6574 * Consolidate build unit test commands * Workaround CI image path bash/sh issue mapbox/mbgl-ci-images#17
anandthakker
added a commit
that referenced
this pull request
May 3, 2018
* Fix style-spec build (#6575) * Ensure style-spec is published with mapbox-gl (#6586) Cherry pick 478dd56 from master * Ensure style spec is published with build Closes #6433 Closes #6574 * Consolidate build unit test commands * Workaround CI image path bash/sh issue mapbox/mbgl-ci-images#17 * Bump style-spec version to 12.0.0-pre.1 (#6595) * Use named exports in style-spec.js (#6602) Cherry pick e83054f from master Fixes #6601 * Ignore whole /dist/ directory Done in master with e83054f
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.
Includes a copy of the compiled style-spec bundle under
dist/style-spec/index.jsin the published mapbox-gl package