From f97b25676e0e4a72b4706726d0bf3b2fe22e9d6c Mon Sep 17 00:00:00 2001
From: Marxsal <throaway@yahoo.com>
Date: Fri, 1 Apr 2022 10:07:38 -0700
Subject: [PATCH 1/2] Make choice selections save to state tiddler (#6585)

* Make choice selections save to state tiddler

Currently choice selections save to current tiddler (Saving), which marks TW as needing to Save. This fixes that by saving the working list to a state tiddler.

* Change state tiddler to $:/state/gettingstarted
---
 editions/tw5.com/tiddlers/saving/Saving.tid | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

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[]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>>/>
 </$set>
 </$vars>
@@ -26,16 +26,13 @@ type: text/vnd.tiddlywiki
 \end
 
 \define uncheckactions(item:"Linux")
-<$action-listops  $subfilter="-[[$item$]]"/>
+<$action-listops  $tiddler=<<stateTiddler>> $subfilter="-[[$item$]]"/>
 \end
 
 \define checkactions(item:"Linux")
-<$action-listops $subfilter="[[$item$]]"/>
-\end
-
-\define uncheckactions(item:"Linux")
-<$action-listops $subfilter="-[[$item$]]"/>
+<$action-listops $tiddler=<<stateTiddler>>  $subfilter="[[$item$]]"/>
 \end
+<$vars stateTiddler=<<qualify "$:/state/gettingstarted">> >
 
 Available methods for saving changes with TiddlyWiki:
 
@@ -65,4 +62,5 @@ Available methods for saving changes with TiddlyWiki:
 </$wikify>
 
 </div>
-</div>
\ No newline at end of file
+</div>
+</$vars>

From 0b6a3452088840005aebfd835e0c85219ec53379 Mon Sep 17 00:00:00 2001
From: "jeremy@jermolene.com" <jeremy@jermolene.com>
Date: Fri, 1 Apr 2022 21:01:33 +0100
Subject: [PATCH 2/2] Revert "CI: Only commit if there are changes"

This reverts commit e4b26983800029b669ed06584027afc90da69859.
---
 bin/build-tw-org.sh | 17 ++++++++++-------
 bin/ci-push.sh      | 19 +++++++++++--------
 2 files changed, 21 insertions(+), 15 deletions(-)

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 ..