From 664998380485e95e69e305498cfb062b5d863501 Mon Sep 17 00:00:00 2001
From: Otto Liljalaakso <otto.liljalaakso@iki.fi>
Date: Jul 26 2024 19:58:39 +0000
Subject: [PATCH 1/2] Fix CI job check-valid-tutorial-pr


Zuul merged the PR into main before running the job, thus the check
always found no changes and failed. From Zuul docs, actually
origin/main holds the main branch before merge. Switch to check against
that.

---

diff --git a/ci/check-valid-tutorial-pr b/ci/check-valid-tutorial-pr
index f3c5dfb..0e0f208 100755
--- a/ci/check-valid-tutorial-pr
+++ b/ci/check-valid-tutorial-pr
@@ -1,5 +1,5 @@
 #!/usr/bin/bash
-if [ "$(git diff --name-only main)" != "share/packagers" ]; then
+if [ "$(git diff --name-only origin/main)" != "share/packagers" ]; then
     echo "Not a valid tutorial PR. Expected change in 'share/packagers' only."
     exit 1
 fi

From 1f1ab05fa3c83b8d7f1ad46d5abc5a2afe3f8ad3 Mon Sep 17 00:00:00 2001
From: Otto Liljalaakso <otto.liljalaakso@iki.fi>
Date: Jul 26 2024 20:04:49 +0000
Subject: [PATCH 2/2] Print changed files when check-valid-tutorial-pr fails


---

diff --git a/ci/check-valid-tutorial-pr b/ci/check-valid-tutorial-pr
index 0e0f208..c1d48c9 100755
--- a/ci/check-valid-tutorial-pr
+++ b/ci/check-valid-tutorial-pr
@@ -1,5 +1,6 @@
 #!/usr/bin/bash
-if [ "$(git diff --name-only origin/main)" != "share/packagers" ]; then
-    echo "Not a valid tutorial PR. Expected change in 'share/packagers' only."
+DIFF=$(git diff --name-only origin/main)
+if [ "$DIFF" != "share/packagers" ]; then
+    echo -e "Not a valid tutorial PR. Expected change in 'share/packagers' only. Changes in:\n$DIFF"
     exit 1
 fi