Skip to content

Fix PLC gate: compare ArfBot.xml to main with two-dot diff #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dalethomas81 merged 2 commits into from
Sep 13, 2026
Merged

Fix PLC gate: compare ArfBot.xml to main with two-dot diff #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d85b529
Fix PLC gate: compare ArfBot.xml to main with two-dot diff
Sep 12, 2026
9512c33
update version
Sep 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .github/workflows/plc-gate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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."
Expand Down
Binary file modified Codesys/ArfBot.project
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions Codesys/ArfBot.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<project xmlns="http://www.plcopen.org/xml/tc6_0200">
<fileHeader companyName="" productName="CODESYS" productVersion="CODESYS V3.5 SP22 Patch 3" creationDateTime="2026-09-12T16:46:07.7346949" />
<contentHeader name="ArfBotOS" version="1.0.0" modificationDateTime="2026-09-12T16:44:52.4520695" organization="Thomas Labs" author="Dale Thomas">
<fileHeader companyName="" productName="CODESYS" productVersion="CODESYS V3.5 SP22 Patch 3" creationDateTime="2026-09-12T16:59:03.7424811" />
<contentHeader name="ArfBotOS" version="1.0.0" modificationDateTime="2026-09-12T16:58:41.7952343" organization="Thomas Labs" author="Dale Thomas">
<Comment>https://github.com/dalethomas81/ArfBotOS</Comment>
<coordinateInfo>
<fbd>
Expand Down Expand Up @@ -1578,7 +1578,7 @@ RESERVED: INT:=46;</xhtml>
<string length="80" />
</type>
<initialValue>
<simpleValue value="'v2.2026.37.0-RobotAnimator-7-gcb5df5e'" />
<simpleValue value="'v2.2026.37.1-AlarmHistory-5-g06119e5'" />
</initialValue>
<documentation>
<xhtml xmlns="http://www.w3.org/1999/xhtml"> git describe --tags --always --dirty
Expand Down
Loading