diff --git a/bin/build-tw-org.sh b/bin/build-tw-org.sh index a7b0c4426..eb76baa85 100755 --- a/bin/build-tw-org.sh +++ b/bin/build-tw-org.sh @@ -84,11 +84,14 @@ rm $TWORG_BUILD_OUTPUT/build.tid || exit 1 # Push output back to GitHub -pushd $TWORG_BUILD_OUTPUT || exit 1 -git config --global user.email "actions@github.com" || exit 1 -git config --global user.name "GitHub Actions" || exit 1 -git add -A . || exit 1 -git diff --exit-code || git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))" || exit 1 -git remote add deploy "https://$GH_TOKEN@github.com/TiddlyWiki/tiddlywiki.org-gh-pages.git" &>/dev/null || exit 1 -git push deploy main &>/dev/null || exit 1 +# Exit script immediately if any command fails +set -e + +pushd $TWORG_BUILD_OUTPUT +git config --global user.email "actions@github.com" +git config --global user.name "GitHub Actions" +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 diff --git a/bin/ci-push.sh b/bin/ci-push.sh index 55b7f8be0..dff297c80 100755 --- a/bin/ci-push.sh +++ b/bin/ci-push.sh @@ -2,11 +2,14 @@ # Push output back to GitHub -cd output || exit 1 -git config --global user.email "actions@github.com" || exit 1 -git config --global user.name "GitHub Actions" || exit 1 -git add -A . || exit 1 -git diff --exit-code || git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))" || exit 1 -git remote add deploy "https://$GH_TOKEN@github.com/Jermolene/jermolene.github.io.git" || exit 1 -git push deploy master || exit 1 -cd .. || exit 1 +# Exit script immediately if any command fails +set -e + +cd output +git config --global user.email "actions@github.com" +git config --global user.name "GitHub Actions" +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/Jermolene/jermolene.github.io.git" &>/dev/null +git push deploy master &>/dev/null +cd .. diff --git a/editions/tw5.com/tiddlers/saving/Saving.tid b/editions/tw5.com/tiddlers/saving/Saving.tid index 9afc8cfb7..d9072d8d7 100644 --- a/editions/tw5.com/tiddlers/saving/Saving.tid +++ b/editions/tw5.com/tiddlers/saving/Saving.tid @@ -1,15 +1,15 @@ created: 20140912140651119 -list: -modified: 20200507203641230 +modified: 20220401151525812 saving-browser: Firefox Chrome Edge [[Internet Explorer]] Safari Opera saving-os: Windows Mac Linux Android iOS tags: [[Working with TiddlyWiki]] title: Saving type: text/vnd.tiddlywiki + \define alltagsfilter() <$vars tag1="tag[" tag2="]" lb="[" rb="tag[Saving]sort[delivery]]"> -<$set filter="[list[]addprefixaddsuffix]+[join[]addprefixaddsuffix]" name="alltags" select=0> +<$set filter="[listaddprefixaddsuffix]+[join[]addprefixaddsuffix]" name="alltags" select=0> <$text text=<>/> @@ -26,16 +26,13 @@ type: text/vnd.tiddlywiki \end \define uncheckactions(item:"Linux") -<$action-listops $subfilter="-[[$item$]]"/> +<$action-listops $tiddler=<> $subfilter="-[[$item$]]"/> \end \define checkactions(item:"Linux") -<$action-listops $subfilter="[[$item$]]"/> -\end - -\define uncheckactions(item:"Linux") -<$action-listops $subfilter="-[[$item$]]"/> +<$action-listops $tiddler=<> $subfilter="[[$item$]]"/> \end +<$vars stateTiddler=<> > Available methods for saving changes with TiddlyWiki: @@ -65,4 +62,5 @@ Available methods for saving changes with TiddlyWiki: - \ No newline at end of file + +