Skip to content

MPT-17622 detect deployment changes from integration branch #342

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
ffaraone merged 1 commit into from
Feb 3, 2026
Merged

MPT-17622 detect deployment changes from integration branch #342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 28 additions & 2 deletions .github/workflows/ffc_sync_upstream.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,24 @@ jobs:
git checkout -b bp-sync-${{ steps.latest_commit.outputs.LATEST_COMMIT }} ${{ steps.latest_commit.outputs.LATEST_COMMIT }}
git push origin bp-sync-${{ steps.latest_commit.outputs.LATEST_COMMIT }}

- name: Check for changes in optscale-deploy folder for main
id: check_deploy_changes_main
run: |
if git diff main sync-${{ steps.latest_commit.outputs.LATEST_COMMIT }} -- optscale-deploy | grep -q .; then
echo "deploy_changes=yes" >> "$GITHUB_OUTPUT"
else
echo "deploy_changes=no" >> "$GITHUB_OUTPUT"
fi

- name: Check for changes in optscale-deploy folder for release
id: check_deploy_changes_release
run: |
if git diff release/${{ vars.CURRENT_RELEASE }} bp-sync-${{ steps.latest_commit.outputs.LATEST_COMMIT }} -- optscale-deploy | grep -q .; then
echo "deploy_changes=yes" >> "$GITHUB_OUTPUT"
else
echo "deploy_changes=no" >> "$GITHUB_OUTPUT"
fi

- name: Check if PR exists for main
id: check_pr_main
if: steps.check_branch_main.outputs.branch_main_exists != 'yes'
Expand Down Expand Up @@ -107,11 +125,15 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
if: steps.check_pr_main.outputs.pr_main_exists == 'no'
run: |
TITLE='Sync upstream/integration (${{ steps.latest_commit.outputs.LATEST_COMMIT }}) -> main ${{ steps.current_date.outputs.date }}'
if [ "${{ steps.check_deploy_changes_main.outputs.deploy_changes }}" == "yes" ]; then
TITLE="⚠️ $TITLE (deployment changes present)"
fi
gh pr create \
--repo "$GITHUB_REPOSITORY" \
--head 'sync-${{ steps.latest_commit.outputs.LATEST_COMMIT }}' \
--base 'main' \
--title 'Sync upstream/integration (${{ steps.latest_commit.outputs.LATEST_COMMIT }}) -> main ${{ steps.current_date.outputs.date }}' \
--title "$TITLE" \
--body "This PR syncs the latest changes from upstream to main."


Expand All @@ -120,9 +142,13 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
if: steps.check_pr_bp.outputs.pr_bp_exists == 'no'
run: |
TITLE='Sync upstream/integration (${{ steps.latest_commit.outputs.LATEST_COMMIT }}) -> release/${{ vars.CURRENT_RELEASE }} ${{ steps.current_date.outputs.date }}'
if [ "${{ steps.check_deploy_changes_release.outputs.deploy_changes }}" == "yes" ]; then
TITLE="⚠️ $TITLE (deployment changes present)"
fi
gh pr create \
--repo "$GITHUB_REPOSITORY" \
--head 'bp-sync-${{ steps.latest_commit.outputs.LATEST_COMMIT }}' \
--base 'release/${{ vars.CURRENT_RELEASE }}' \
--title 'Sync upstream/integration (${{ steps.latest_commit.outputs.LATEST_COMMIT }}) -> release/${{ vars.CURRENT_RELEASE }} ${{ steps.current_date.outputs.date }}' \
--title "$TITLE" \
--body "This PR syncs the latest changes from upstream to release branch."