diff --git a/.github/workflows/plc-gate.yml b/.github/workflows/plc-gate.yml index ab71891..d06fcd6 100644 --- a/.github/workflows/plc-gate.yml +++ b/.github/workflows/plc-gate.yml @@ -18,8 +18,11 @@ jobs: - name: ArfBot.xml must differ from main run: | set -euo pipefail - if git diff --quiet origin/main...HEAD -- Codesys/ArfBot.xml; then - echo "::error::Codesys/ArfBot.xml has no diff vs main." + # Two-dot (or blob) compare: file on main vs file in this checkout. + # Three-dot (A...B) uses a merge-base; with criss-cross main/dev merges + # git can pick a base equal to HEAD and report an empty diff. + if git diff --quiet origin/main HEAD -- Codesys/ArfBot.xml; then + echo "::error::Codesys/ArfBot.xml is identical to main." echo "Export PLCopen XML (Project → Export) after changing the PLC project or stamping GVL_Version.sPlcVersion." exit 1 fi @@ -28,12 +31,12 @@ jobs: - name: If ArfBot.project changed, XML must also change run: | set -euo pipefail - if git diff --quiet origin/main...HEAD -- Codesys/ArfBot.project; then + if git diff --quiet origin/main HEAD -- Codesys/ArfBot.project; then echo "ArfBot.project unchanged; skip paired-export check." exit 0 fi - if git diff --quiet origin/main...HEAD -- Codesys/ArfBot.xml; then - echo "::error::ArfBot.project changed but ArfBot.xml did not. Re-export PLCopen XML." + if git diff --quiet origin/main HEAD -- Codesys/ArfBot.xml; then + echo "::error::ArfBot.project changed but ArfBot.xml is identical to main. Re-export PLCopen XML." exit 1 fi echo "Project and XML both changed." diff --git a/Codesys/ArfBot.project b/Codesys/ArfBot.project index bcae45d..f95a58b 100644 Binary files a/Codesys/ArfBot.project and b/Codesys/ArfBot.project differ diff --git a/Codesys/ArfBot.xml b/Codesys/ArfBot.xml index bdf7698..4d0ea84 100644 --- a/Codesys/ArfBot.xml +++ b/Codesys/ArfBot.xml @@ -1,7 +1,7 @@  - - + + https://github.com/dalethomas81/ArfBotOS @@ -1578,7 +1578,7 @@ RESERVED: INT:=46; - + git describe --tags --always --dirty