Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
81e26cc
perf: port debug session rendering and polling optimizations from web…
dcoutinho1328 Apr 13, 2026
3e45653
feat: sync version control port and UI from web repo
dcoutinho1328 Apr 14, 2026
9bd7887
fix: sync lint and formatting fixes from web repo
dcoutinho1328 Apr 14, 2026
5e44ef9
fix: sync shared-ui-migration refactor and conflict resolution from web
dcoutinho1328 Apr 14, 2026
9958087
chore: sync shared surfaces and dependency versions with web repo
dcoutinho1328 Apr 14, 2026
f6a4edd
fix: open project picker was using create-project empty-dir check
dcoutinho1328 Apr 14, 2026
78141db
revert: restore useOpenPLCStore for hook-pattern selectors (sync from…
dcoutinho1328 Apr 14, 2026
48ea24c
fix: sync import sort fix from web (app-layout.tsx)
dcoutinho1328 Apr 14, 2026
965fda3
fix: sort imports in version-control-adapter
dcoutinho1328 Apr 14, 2026
8f7c5f6
ci: disable test workflow triggers (keep workflow_dispatch only)
dcoutinho1328 Apr 14, 2026
7cf1baf
fix: POU creation validation, simulator default, and server/remote de…
dcoutinho1328 Apr 14, 2026
15e0c89
fix: disable branch status bar and mark project unsaved on POU creation
dcoutinho1328 Apr 14, 2026
46e7909
fix: suppress lint errors for disabled branch status bar
dcoutinho1328 Apr 14, 2026
2687308
fix: discard flag reset, duplicate resize handle, and missing IPC return
dcoutinho1328 Apr 14, 2026
6a08a17
fix: address PR review issues across multiple components
dcoutinho1328 Apr 14, 2026
6b00b9e
ci: use cross-repo token for web repo access in sync check
dcoutinho1328 Apr 14, 2026
05ad2bc
test: add test comment to shared surface to verify sync check
dcoutinho1328 Apr 14, 2026
96a848f
ci: skip sync check gracefully when cross-repo token is missing
dcoutinho1328 Apr 14, 2026
3c906e9
revert: remove test comment from shared surface
dcoutinho1328 Apr 14, 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
29 changes: 23 additions & 6 deletions .github/workflows/ci-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,51 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Check for cross-repo token
id: token-check
run: |
if [ -z "$TOKEN" ]; then
echo "::warning::CROSS_REPO_TOKEN is not set. Skipping sync check (expected on fork PRs)."
echo "skip=true" >> "$GITHUB_OUTPUT"
else
echo "skip=false" >> "$GITHUB_OUTPUT"
fi
env:
TOKEN: ${{ secrets.CROSS_REPO_TOKEN }}

- name: Checkout editor repo
if: steps.token-check.outputs.skip == 'false'
uses: actions/checkout@v4
with:
path: editor

- name: Checkout web repo (target branch)
if: steps.token-check.outputs.skip == 'false'
uses: actions/checkout@v4
with:
repository: Autonomy-Logic/openplc-web
ref: ${{ github.event.pull_request.base.ref }}
path: web
token: ${{ secrets.CROSS_REPO_TOKEN }}
continue-on-error: true
id: checkout-web-target

- name: Checkout web repo (main fallback)
if: steps.checkout-web-target.outcome == 'failure'
if: steps.token-check.outputs.skip == 'false' && steps.checkout-web-target.outcome == 'failure'
uses: actions/checkout@v4
with:
repository: Autonomy-Logic/openplc-web
ref: main
path: web
token: ${{ secrets.CROSS_REPO_TOKEN }}

- name: Warn about branch fallback
if: steps.checkout-web-target.outcome == 'failure'
if: steps.token-check.outputs.skip == 'false' && steps.checkout-web-target.outcome == 'failure'
run: |
echo "::warning::Web repo does not have branch '${{ github.event.pull_request.base.ref }}'. Fell back to 'main'."

- name: Compare surfaces against target branch
if: steps.token-check.outputs.skip == 'false'
id: compare-target
run: |
set +e
Expand Down Expand Up @@ -74,10 +91,10 @@ jobs:
fi

- name: Find matching web PRs
if: steps.compare-target.outputs.match == 'False'
if: steps.token-check.outputs.skip == 'false' && steps.compare-target.outputs.match == 'False'
id: find-prs
env:
GH_TOKEN: ${{ github.token }}
GH_TOKEN: ${{ secrets.CROSS_REPO_TOKEN }}
run: |
BASE_BRANCH="${{ github.event.pull_request.base.ref }}"

Expand All @@ -101,7 +118,7 @@ jobs:
fi

- name: Check web PRs for sync
if: steps.compare-target.outputs.match == 'False' && steps.find-prs.outputs.pr_count != '0'
if: steps.token-check.outputs.skip == 'false' && steps.compare-target.outputs.match == 'False' && steps.find-prs.outputs.pr_count != '0'
id: check-prs
run: |
PR_JSON=$(cat /tmp/web-prs.json)
Expand Down Expand Up @@ -147,7 +164,7 @@ jobs:
done

- name: Report result
if: always()
if: always() && steps.token-check.outputs.skip == 'false'
run: |
MATCH="${{ steps.compare-target.outputs.match }}"
MATCHED_PR="${{ steps.check-prs.outputs.matched_pr }}"
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,7 @@ name: Test
run-name: OpenPLC CI pipeline - Unit test

on:
push:
branches:
- main
- development
pull_request:
# The branches below must be a subset of the branches above
branches:
- main
- development
workflow_dispatch:
jobs:
test:
runs-on: ${{ matrix.os }}
Expand Down
Loading
Loading