Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
b392e77
ci(workflow): add filter input to user-update-branch.yml for partial …
marc-romu Apr 20, 2025
b64283b
docs: update changelog with 1 closed issues
actions-user Apr 20, 2025
c3d0b53
Merge branch 'main' into marc-romu/workflows
marc-romu Apr 20, 2025
bb79cf3
ci(workflow): add filter input to user-update-branch.yml for partial …
marc-romu Apr 20, 2025
ae378e1
ci(workflow): fixed run errors in user-update-branch
marc-romu Apr 20, 2025
91313e7
ci(workflow): fixed run errors in user-update-branch (#137)
marc-romu Apr 20, 2025
17f92f6
ci(workflow): fix not detecting new files and deleted files in user-u…
marc-romu Apr 20, 2025
6f14a5b
ci(workflow): fix not detecting new files and deleted files in user-u…
marc-romu Apr 20, 2025
0c0e3eb
ci(workflow): fix not properly creating PR in user-update-branch
marc-romu Apr 20, 2025
d812b60
ci(workflow): updated PR title and description in user-update-branch …
marc-romu Apr 20, 2025
37af62f
ci(workflows): fix issues with user-update-branch (#139)
marc-romu Apr 20, 2025
3359e7e
chore(branch): update main from marc-romu/chat for path .github
actions-user Apr 20, 2025
0a590a5
chore(branch): update main from marc-romu/chat for path .github (#140)
marc-romu Apr 20, 2025
4f0e270
ci(workflows): remove old code
marc-romu Apr 20, 2025
d01c4e1
update marc-romu/workflows (#141)
marc-romu Apr 20, 2025
b2a98ec
ci(workflow): add mode selector to user-code-style.yml
marc-romu Apr 20, 2025
428f8af
ci(workflow): change default to check in user-code-style
marc-romu Apr 20, 2025
a874e99
ci(workflow): fix issue in user-code-style
marc-romu Apr 20, 2025
cf6b187
ci(workflow): missing github-token for code-style
marc-romu Apr 20, 2025
fc07315
fix(workflow): code-style action
marc-romu Apr 20, 2025
f14e718
ci(workflow): user-code-style minor fixes
marc-romu Apr 20, 2025
0be81c1
ci: fix nesting test project in solution
marc-romu Apr 20, 2025
bbfc792
ci(workflow): fix namespace check
marc-romu Apr 20, 2025
c929797
ci(workflow): fix namespace check
marc-romu Apr 20, 2025
6ddb210
ci(workflow): fix indention in header-fixer
marc-romu Apr 20, 2025
79dee86
ci: minor fixes
marc-romu Apr 20, 2025
c3df8e1
ci(workflow): reapply filter to user-update-branc
marc-romu Apr 20, 2025
0b26fd5
ci(workflow): minor fixes in update-branch
marc-romu Apr 20, 2025
754cf61
chore(branch): update main from marc-romu/workflows for path .github
actions-user Apr 20, 2025
ca4a375
chore(branch): update main from marc-romu/workflows (#142)
marc-romu Apr 20, 2025
2c86288
chore(branch): update marc-romu/workflows from marc-romu/chat for pat…
actions-user Apr 20, 2025
ab56e1a
ci(workflows): fixes in update-branch
marc-romu Apr 20, 2025
ef87425
chore(branch): update main from marc-romu/workflows for path .github
actions-user Apr 20, 2025
57bcee5
chore(branch): update main from marc-romu/workflows for path .github …
marc-romu Apr 20, 2025
b1c503e
ci(workflow): fix not detecting deletions when filtering
marc-romu Apr 20, 2025
be5a013
chore(branch): update marc-romu/workflows from main for path .github
actions-user Apr 20, 2025
5c2c0c2
ci(workflow): fix user-update-branch to handle deletion
marc-romu Apr 20, 2025
487e83a
Merge branch 'marc-romu/workflows' into main
marc-romu Apr 20, 2025
13fad1a
Merge branch 'dev' into main
marc-romu Apr 20, 2025
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
35 changes: 16 additions & 19 deletions .github/workflows/user-update-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,33 +186,30 @@ jobs:
fi
}

# Handle filtered path update with modified and deleted files
# Handle filtered path update: delete removed files, then update contents
if [[ -n "$FILTER" ]]; then
echo "Updating specific path: $FILTER"
git checkout origin/$ORIGIN -- "$FILTER"
# Commit modified files
modified=$(git diff origin/$TARGET origin/$ORIGIN --name-only -- "$FILTER")
if [[ -n "$modified" ]]; then
echo "$modified" | xargs -r git add
git commit -m "chore(branch): update $TARGET from $ORIGIN for path $FILTER"
echo "merge_status=success" >> $GITHUB_OUTPUT
echo "Modified files detected and committed for path $FILTER."
exit 0
fi
# Commit deleted files
deleted=$(git diff origin/$TARGET origin/$ORIGIN --name-only --diff-filter=D -- "$FILTER")
# Remove files deleted in origin
deleted=$(git diff origin/$TARGET origin/$ORIGIN --diff-filter=D --name-only -- "$FILTER")
if [[ -n "$deleted" ]]; then
echo "$deleted" | while read file; do
echo "Removing file: $file"
git rm "$file"
git rm -f "$file"
done
git commit -m "chore(branch): update $TARGET from $ORIGIN for path $FILTER (deleted files)"
fi
# Checkout new and modified files
git checkout origin/$ORIGIN -- "$FILTER"
# Stage all changes under filter
git add "$FILTER"
# Commit if there are staged changes
if git diff --cached --quiet; then
echo "merge_status=no_changes" >> $GITHUB_OUTPUT
echo "No changes to merge for path $FILTER. Branches are already in sync."
else
git commit -m "chore(branch): update $TARGET from $ORIGIN for path $FILTER"
echo "merge_status=success" >> $GITHUB_OUTPUT
echo "Deleted files detected and removed for path $FILTER."
exit 0
echo "Detected and committed changes for path $FILTER."
fi
echo "merge_status=no_changes" >> $GITHUB_OUTPUT
echo "No changes to merge for path $FILTER. Branches are already in sync."
exit 0
fi

Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed a bug in `DataProcessor` where results were being duplicated when multiple branches were grouped together to unsuccessfully prevent unnecessary API calls [#32](https://github.com/architects-toolkit/SmartHopper/issues/32)
- Fixed inconsistent list format handling between `AIListEvaluate` and `AIListFilter` components.

### Fixed
- Fixes "Bug: Unmatching paths in list components return duplicated values" ([#32](https://github.com/architects-toolkit/SmartHopper/issues/32)).

## [0.2.0-alpha] - 2025-04-06

### Added
Expand Down
10 changes: 10 additions & 0 deletions SmartHopper.sln
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{D4C6D3D5-2B3A-4B6C-8C3D-57B2D0D3C1E1} = {05A44F09-190D-434E-A91B-0ECA631110FE}
{D5C6D3D5-2B3A-4B6C-8C3D-57B2D0D3C1E5} = {05A44F09-190D-434E-A91B-0ECA631110FE}
{60732624-037C-4D6D-BC4C-588A0C25C338} = {05A44F09-190D-434E-A91B-0ECA631110FE}
{A932CFFA-0C82-4A1F-92F2-003CDE1C94AC} = {05A44F09-190D-434E-A91B-0ECA631110FE}
{B932CFFA-0C82-4A1F-92F2-003CDE1C94AD} = {05A44F09-190D-434E-A91B-0ECA631110FE}
{B932CFFA-0C82-4A1F-92F2-003CDE1C94AE} = {05A44F09-190D-434E-A91B-0ECA631110FE}
{F2063A0F-FDF2-4AD2-8C92-1E374B991752} = {05A44F09-190D-434E-A91B-0ECA631110FE}
{087FFA5E-1049-459D-9C68-1C0B8E7F9EBC} = {05A44F09-190D-434E-A91B-0ECA631110FE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0D5011CB-B808-41E4-A6FC-C01F3190649C}
EndGlobalSection
Expand Down
Loading