diff --git a/.travis.yml b/.travis.yml index 5f913ce41..d7f1a5566 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ jobs: script: - ./bin/travis-pre-build.sh - export TW5_BUILD_TIDDLYWIKI='./tiddlywiki.js' - - export TW5_BUILD_VERSION=$(./bin/get-version-number) + - export TW5_BUILD_VERSION=$(./bin/get-plugin-library-version-number) - export TW5_BUILD_DETAILS="Prerelease built from branch '$TRAVIS_BRANCH' at commit $(git rev-parse HEAD) of $(git remote get-url origin) at $(date +'%F %T %Z')" - export TW5_BUILD_MAIN_EDITION='./editions/prerelease' - export TW5_BUILD_OUTPUT='./output/prerelease' @@ -26,7 +26,7 @@ jobs: script: - ./bin/travis-pre-build.sh - export TW5_BUILD_TIDDLYWIKI='./node_modules/tiddlywiki/tiddlywiki.js' - - export TW5_BUILD_VERSION=$(./bin/get-version-number) + - export TW5_BUILD_VERSION=$(./bin/get-plugin-library-version-number) - export TW5_BUILD_DETAILS="Built from branch '$TRAVIS_BRANCH' at commit $(git rev-parse HEAD) of $(git remote get-url origin) at $(date +'%F %T %Z')" - export TW5_BUILD_MAIN_EDITION='./editions/tw5.com' - export TW5_BUILD_OUTPUT='./output' diff --git a/bin/build-site.sh b/bin/build-site.sh index e38344052..f26496acf 100755 --- a/bin/build-site.sh +++ b/bin/build-site.sh @@ -107,6 +107,15 @@ node $TW5_BUILD_TIDDLYWIKI \ --build empty \ || exit 1 + +# /test.html Test edition +node ./tiddlywiki.js \ + ./editions/test \ + --verbose \ + --version \ + --rendertiddler $:/core/save/all test.html text/plain \ + || exit 1 + # /dev/index.html Developer docs # /dev/favicon.ico Favicon for dev site # /dev/static.html Static rendering of default tiddlers diff --git a/bin/get-version-number b/bin/get-plugin-library-version-number similarity index 89% rename from bin/get-version-number rename to bin/get-plugin-library-version-number index 4a81437e2..b5fcd6d81 100755 --- a/bin/get-version-number +++ b/bin/get-plugin-library-version-number @@ -16,4 +16,4 @@ if(!json.version) { throw "Missing version number in package.json"; } -process.stdout.write(json.version.split("-")[0]); +process.stdout.write("v" + json.version.split("-")[0]);