Merge pull request #7 from unisoncomputing/fix-trunk-builds

Handle trunk ucm failing on in-place transcripts

Author: ceedubs

.github/workflows/cloud-client-tests.yml

@@ -40,6 +40,7 @@ jobs:
         run: ./install-ucm.sh
       - name: Cache Unison codebase
         id: cache-unison-codebase
+        if: ${{ !cancelled() && startsWith(matrix.ucm-release-version, 'release') }}
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf #v4.2.2
         with:
           path: unison-code
@@ -51,6 +52,7 @@ jobs:
           CLOUD_CLIENT_VERSION: ${{ matrix.cloud-client-version }}
           UNISON_CLOUD_ACCESS_TOKEN: ${{ secrets.CLOUD_USER_ACCESS_TOKEN }}
           UNISON_DEBUG: timing
+          UCM_RELEASE: ${{ matrix.ucm-release-version }}
         run: |
           apt-get update && apt-get -y install gettext-base
           ./run-tests.sh

run-tests.sh

@@ -7,7 +7,18 @@ envsubst < cloud-tests.tpl.md > cloud-tests.md
 exit_status=0
 codebase="$PWD/unison-code"
 
-ucm -C "$codebase" transcript.fork --save-codebase-to "$codebase" cloud-tests.md || exit_status=$?
+run_transcript() {
+  case "$UCM_RELEASE" in
+    "release%2F0.5.25" | "release%2F0.5.41")
+      ucm -C "$codebase" transcript.fork --save-codebase-to "$codebase" cloud-tests.md
+      ;;
+    *)
+      ucm -C "$codebase" transcript.in-place cloud-tests.md
+      ;;
+  esac
+}
+
+run_transcript || exit_status=$?
 cat cloud-tests.output.md
 
 exit "$exit_status"