Skip to content

pr #240

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
Parent: Merge pull request #236 from TechnologyEnhancedLearning/master
merged 7 commits into from
Sep 1, 2025
Merged

pr #240

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
942f2ed
chore(dep): remove check for now
Phil-NHS Sep 1, 2025
362bec9
Merge pull request #238 from TechnologyEnhancedLearning/ci-dependabot…
Phil-NHS Sep 1, 2025
e319eb9
Merge pull request #239 from TechnologyEnhancedLearning/Automatic_ver…
Phil-NHS Sep 1, 2025
15aa4b3
chore(deps): token definition
Phil-NHS Sep 1, 2025
69acfe9
Merge pull request #241 from TechnologyEnhancedLearning/ci-dependabot…
Phil-NHS Sep 1, 2025
acb65e5
chore(dep): merge check
Phil-NHS Sep 1, 2025
9e447b2
Merge pull request #242 from TechnologyEnhancedLearning/ci-dependabot…
Phil-NHS Sep 1, 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
19 changes: 12 additions & 7 deletions .github/workflows/automerge-dependabot-prs-into-collected-branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ jobs:
# if dependabot and checks ran
# if: (github.event_name != 'check_suite' || github.event.check_suite.conclusion == 'success')
# qqqq put back in later if: (github.actor == 'dependabot[bot]' || github.event_name == 'workflow_dispatch')&& (github.event_name != 'check_suite' || github.event.check_suite.conclusion == 'success')
if: github.event.check_suite.conclusion == 'success' && github.actor == 'dependabot[bot]' && github.event.check_suite.pull_requests[0].base.ref == 'Automatic_version_update_dependabot'


# qqqq add in after testing && github.actor == 'dependabot[bot]'
if: github.event.check_suite.conclusion == 'success' && github.event.check_suite.pull_requests[0].base.ref == 'Automatic_version_update_dependabot'
steps:
- name: Checkout the repository
uses: actions/checkout@v3
Expand All @@ -57,23 +60,25 @@ jobs:
run: |
pr_title="${{ github.event.pull_request.title }}"
if [[ $pr_title == *"(major)"* ]]; then
echo "update_type=major" >> $github_output
echo "update_type=major" >> $GITHUB_OUTPUT
else
echo "update_type=minor_or_patch" >> $github_output
echo "update_type=minor_or_patch" >> $GITHUB_OUTPUT
fi

- name: auto-merge minor and patch updates
if: steps.extract.outputs.update_type == 'minor_or_patch'
# auto should set the the request to merge once checks complete
# qqqq could squash for cleaner? --squash "${{ github.event.pull_request.html_url }}"
run: gh pr merge --auto 1
# run: gh pr merge --auto 1
run: gh pr merge --auto --merge ${{ github.event.check_suite.pull_requests[0].number }}
env:
github_token: ${{ secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: auto-merge major updates
if: steps.extract.outputs.update_type == 'major'
# auto should set the the request to merge once checks complete
# qqqq could squash for cleaner? --squash "${{ github.event.pull_request.html_url }}"
run: gh pr merge --auto 1
# run: gh pr merge --auto 1
run: gh pr merge --auto --merge ${{ github.event.check_suite.pull_requests[0].number }}
env:
github_token: ${{ secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Loading