Merge branch 'tiddlywiki-com'

This commit is contained in:
jeremy@jermolene.com 2022-04-01 21:06:42 +01:00
commit 1f14969ab8
3 changed files with 29 additions and 25 deletions

View File

@ -84,11 +84,14 @@ rm $TWORG_BUILD_OUTPUT/build.tid || exit 1
# Push output back to GitHub # Push output back to GitHub
pushd $TWORG_BUILD_OUTPUT || exit 1 # Exit script immediately if any command fails
git config --global user.email "actions@github.com" || exit 1 set -e
git config --global user.name "GitHub Actions" || exit 1
git add -A . || exit 1 pushd $TWORG_BUILD_OUTPUT
git diff --exit-code || git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))" || exit 1 git config --global user.email "actions@github.com"
git remote add deploy "https://$GH_TOKEN@github.com/TiddlyWiki/tiddlywiki.org-gh-pages.git" &>/dev/null || exit 1 git config --global user.name "GitHub Actions"
git push deploy main &>/dev/null || exit 1 git add -A .
git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))"
git remote add deploy "https://$GH_TOKEN@github.com/TiddlyWiki/tiddlywiki.org-gh-pages.git" &>/dev/null
git push deploy main &>/dev/null
popd popd

View File

@ -2,11 +2,14 @@
# Push output back to GitHub # Push output back to GitHub
cd output || exit 1 # Exit script immediately if any command fails
git config --global user.email "actions@github.com" || exit 1 set -e
git config --global user.name "GitHub Actions" || exit 1
git add -A . || exit 1 cd output
git diff --exit-code || git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))" || exit 1 git config --global user.email "actions@github.com"
git remote add deploy "https://$GH_TOKEN@github.com/Jermolene/jermolene.github.io.git" || exit 1 git config --global user.name "GitHub Actions"
git push deploy master || exit 1 git add -A .
cd .. || exit 1 git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))"
git remote add deploy "https://$GH_TOKEN@github.com/Jermolene/jermolene.github.io.git" &>/dev/null
git push deploy master &>/dev/null
cd ..

View File

@ -1,15 +1,15 @@
created: 20140912140651119 created: 20140912140651119
list: modified: 20220401151525812
modified: 20200507203641230
saving-browser: Firefox Chrome Edge [[Internet Explorer]] Safari Opera saving-browser: Firefox Chrome Edge [[Internet Explorer]] Safari Opera
saving-os: Windows Mac Linux Android iOS saving-os: Windows Mac Linux Android iOS
tags: [[Working with TiddlyWiki]] tags: [[Working with TiddlyWiki]]
title: Saving title: Saving
type: text/vnd.tiddlywiki type: text/vnd.tiddlywiki
\define alltagsfilter() \define alltagsfilter()
<$vars tag1="tag[" tag2="]" lb="[" rb="tag[Saving]sort[delivery]]"> <$vars tag1="tag[" tag2="]" lb="[" rb="tag[Saving]sort[delivery]]">
<$set filter="[list[]addprefix<tag1>addsuffix<tag2>]+[join[]addprefix<lb>addsuffix<rb>]" name="alltags" select=0> <$set filter="[list<stateTiddler>addprefix<tag1>addsuffix<tag2>]+[join[]addprefix<lb>addsuffix<rb>]" name="alltags" select=0>
<$text text=<<alltags>>/> <$text text=<<alltags>>/>
</$set> </$set>
</$vars> </$vars>
@ -26,16 +26,13 @@ type: text/vnd.tiddlywiki
\end \end
\define uncheckactions(item:"Linux") \define uncheckactions(item:"Linux")
<$action-listops $subfilter="-[[$item$]]"/> <$action-listops $tiddler=<<stateTiddler>> $subfilter="-[[$item$]]"/>
\end \end
\define checkactions(item:"Linux") \define checkactions(item:"Linux")
<$action-listops $subfilter="[[$item$]]"/> <$action-listops $tiddler=<<stateTiddler>> $subfilter="[[$item$]]"/>
\end
\define uncheckactions(item:"Linux")
<$action-listops $subfilter="-[[$item$]]"/>
\end \end
<$vars stateTiddler=<<qualify "$:/state/gettingstarted">> >
Available methods for saving changes with TiddlyWiki: Available methods for saving changes with TiddlyWiki:
@ -65,4 +62,5 @@ Available methods for saving changes with TiddlyWiki:
</$wikify> </$wikify>
</div> </div>
</div> </div>
</$vars>