Skip to content

Commit f5306e8

Browse files
authored
Merge pull request #258 from fraz3alpha/tidy-up-bundling-process
Tidy up bundling process
2 parents 2823fc7 + f76c12f commit f5306e8

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

.travis.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,17 @@ before_install:
2222
- gem install bundler
2323

2424
script:
25-
# Run the tests against the Javascript libraries we have writte
26-
- bash -c "cd ./browser-extensions/common/js && npm run test-with-coverage"
2725
# Only build the staging website if the github token is available, which means
2826
# that it will only happen for PRs from our own repo, not forks.
2927
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then if [ "$RUNNING_CHALLENGES_GITHUB_TOKEN" != "" ]; then bash ./build/website/build-staging.sh; fi; fi'
3028
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./build/website/build.sh; fi'
3129
- './build/extension-chrome/build.sh'
3230
- './build/extension-firefox/build.sh'
31+
# Moving the test until after the build to start with, so that I can defer having to work out how
32+
# not to bundle the coverage data into the extension zip files.
33+
# Perhaps we should actually be testing the bundled code, rather than that in the repo, not sure.
34+
# Run the tests against the Javascript libraries we have written
35+
- bash -c "cd ./browser-extensions/common/js && npm run test-with-coverage"
3336

3437
# branch whitelist.
3538
# For GitHub Pages - if we push code to master the built code goes to gh-pages

build/extension-chrome/build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,6 @@ cd ${TMP_BUILD_DIR}
6464
# zip -r extension.zip js/ html/ images/ css/ manifest.json
6565
web-ext lint
6666
web-ext build
67+
68+
# Print the size of the built extension
69+
ls -l web-ext-artifacts/running_challenges-*.zip

build/extension-firefox/build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,6 @@ for i in patches/firefox/*.patch; do patch -p0 --directory "${TMP_BUILD_DIR}" <
6868
cd ${TMP_BUILD_DIR}
6969
web-ext lint
7070
web-ext build
71+
72+
# Print the size of the built extension
73+
ls -l web-ext-artifacts/running_challenges-*.zip

0 commit comments

Comments
 (0)