mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-23 10:07:19 +00:00
Code Issues Releases Wiki Activity

CI: Fix plugin library version and build test.html

Browse Source
This commit is contained in:
Jermolene 2019-01-08 10:34:50 +00:00
parent d8104e2c41
commit 824930682a
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -16,7 +16,7 @@ jobs:
script: script:
- ./bin/travis-pre-build.sh - ./bin/travis-pre-build.sh
- export TW5_BUILD_TIDDLYWIKI='./tiddlywiki.js' - 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_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_MAIN_EDITION='./editions/prerelease'
- export TW5_BUILD_OUTPUT='./output/prerelease' - export TW5_BUILD_OUTPUT='./output/prerelease'
@ -26,7 +26,7 @@ jobs:
script: script:
- ./bin/travis-pre-build.sh - ./bin/travis-pre-build.sh
- export TW5_BUILD_TIDDLYWIKI='./node_modules/tiddlywiki/tiddlywiki.js' - 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_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_MAIN_EDITION='./editions/tw5.com'
- export TW5_BUILD_OUTPUT='./output' - export TW5_BUILD_OUTPUT='./output'

9
bin/build-site.sh
View File

@ -107,6 +107,15 @@ node $TW5_BUILD_TIDDLYWIKI \
--build empty \ --build empty \
|| exit 1 || 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/index.html Developer docs
# /dev/favicon.ico Favicon for dev site # /dev/favicon.ico Favicon for dev site
# /dev/static.html Static rendering of default tiddlers # /dev/static.html Static rendering of default tiddlers

2
bin/get-version-number → bin/get-plugin-library-version-number
View File

@ -16,4 +16,4 @@ if(!json.version) {
throw "Missing version number in package.json"; throw "Missing version number in package.json";
} }
process.stdout.write(json.version.split("-")[0]); process.stdout.write("v" + json.version.split("-")[0]);