Skip to content

Commit 7708806

Browse files
committed
Merge branch 'master' into CLOUDP-320243-dev-2.0.0
* master: chore: Docs team review improvements in dev branches (#3466) chore: Updates CHANGELOG.md for #3459 fix: Avoids 0 itemsPerPage and pageNum when the args are missing in plural data sources (#3459) doc: Fixing inconsistent docs in `federated_settings_org_role_mapping` associated to required attributes (#3460) lowering timeout value to ensure creation fails consistently (#3462) chore: Singletons in auto-generated resources (#3458) chore: Updates CHANGELOG.md for #3454 feat: Adds `send_user_provided_resource_tags` attribute for `mongodbatlas_third_party_integration` (#3454) chore: Fixes broken link because of ending parenthesis. (#3448) chore: Remove `links` attributes in auto-generated resources (#3455) doc: Updates Terraform Compatibility Matrix documentation (#3449) chore: Updates Atlas Go SDK (#3446) chore: Replace fwtypes.JSONStringType with jsontypes.NormalizedType (#3452) chore: Use SP10 instead of default SP30 for stream_instance acceptance tests (#3453) chore: JSON attributes in auto-generated resources (#3445) chore: Updates repository to use supported Terraform versions (#3450) chore: Use rebase instead of merge to update dev branches (#3442) chore: Creates temporary workflow to create a test tag using Github actions (#3440) # Conflicts: # .github/workflows/update-dev-branches.yml
2 parents b7c5b5a + 048a6ad commit 7708806

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

.github/workflows/update-dev-branches.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,15 @@ jobs:
7474
exit 1
7575
fi
7676
fi
77+
78+
# Check if there are any changes between rebased branch and original remote branch
79+
if git diff --quiet origin/${{ matrix.branch }} HEAD; then
80+
echo "No changes detected between rebased branch and original remote branch. PR would not introduce any changes."
81+
echo "has-changes=false" >> "${GITHUB_OUTPUT}"
82+
else
83+
echo "Changes detected between rebased branch and original remote branch. PR will introduce changes."
84+
echo "has-changes=true" >> "${GITHUB_OUTPUT}"
85+
fi
7786
7887
- name: Create pull request
7988
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e

0 commit comments

Comments
 (0)