Skip to content

Commit 8fcc378

Browse files
authored
Merge pull request #3011 from TechnologyEnhancedLearning/Automatic_version_update_dependabot
Automatic version update dependabot to dev branch
2 parents b31b0f1 + 7a1b148 commit 8fcc378

File tree

10 files changed

+19871
-237
lines changed

10 files changed

+19871
-237
lines changed

.github/workflows/auto-merge.yml

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
name: Auto Merge Dependabot PRs
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- synchronize
8+
9+
permissions:
10+
pull-requests: write
11+
contents: write
12+
13+
jobs:
14+
auto-merge:
15+
runs-on: ubuntu-latest
16+
if: github.actor == 'dependabot[bot]'
17+
18+
steps:
19+
- name: Checkout the repository
20+
uses: actions/checkout@v3
21+
22+
- name: Set up GitHub CLI
23+
run: |
24+
# Install GitHub CLI (gh)
25+
sudo apt-get update
26+
sudo apt-get install gh
27+
28+
# Authenticate GitHub CLI using the provided token
29+
echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token
30+
31+
- name: Wait for CI workflow to pass (Ensure CI workflow succeeded)
32+
id: wait_for_ci
33+
run: |
34+
# Get the PR number from the GitHub event
35+
PR_NUMBER=${{ github.event.pull_request.number }}
36+
echo "Checking CI status for PR #$PR_NUMBER"
37+
38+
# Define the maximum wait time (in seconds) and the polling interval (in seconds)
39+
MAX_WAIT_TIME=600 # 10 minutes
40+
POLL_INTERVAL=10 # Check every 10 seconds
41+
42+
# Initialize a timer
43+
elapsed_time=0
44+
45+
# Poll CI status until all checks are completed
46+
while true; do
47+
# Fetch the status check rollup for the PR
48+
CI_STATUS=$(gh pr view $PR_NUMBER --json statusCheckRollup)
49+
50+
# Log the fetched response
51+
echo "CI Status Response: $CI_STATUS"
52+
53+
# Parse the checks and check their status
54+
ALL_COMPLETED=true
55+
ALL_CHECKS_PASSED=true
56+
57+
for check in $(echo "$CI_STATUS" | jq -r '.statusCheckRollup[] | @base64'); do
58+
_jq() {
59+
echo "${check}" | base64 --decode | jq -r "${1}"
60+
}
61+
62+
status=$(_jq '.status')
63+
conclusion=$(_jq '.conclusion')
64+
check_name=$(_jq '.name')
65+
66+
# Log check details
67+
echo "Check: $check_name, Status: $status, Conclusion: $conclusion"
68+
if [[ "$check_name" == "auto-merge" ]]; then
69+
echo "Skipping 'auto-merge' workflow check to prevent self-referencing."
70+
continue
71+
fi
72+
73+
# If any check is still in progress, set ALL_COMPLETED to false
74+
if [[ "$status" == "IN_PROGRESS" ]]; then
75+
ALL_COMPLETED=false
76+
fi
77+
78+
# If any completed check has failed, set ALL_CHECKS_PASSED to false
79+
if [[ "$status" == "COMPLETED" && "$conclusion" != "SUCCESS" ]]; then
80+
ALL_CHECKS_PASSED=false
81+
fi
82+
done
83+
84+
# Break the loop if all checks are completed
85+
if [[ "$ALL_COMPLETED" == true ]]; then
86+
break
87+
fi
88+
89+
# Wait for the next polling interval
90+
echo "Waiting for checks to complete... ($elapsed_time/$MAX_WAIT_TIME seconds elapsed)"
91+
sleep $POLL_INTERVAL
92+
elapsed_time=$((elapsed_time + POLL_INTERVAL))
93+
94+
# Exit if the maximum wait time is exceeded
95+
if [[ "$elapsed_time" -ge "$MAX_WAIT_TIME" ]]; then
96+
echo "Timed out waiting for CI checks to complete."
97+
exit 1
98+
fi
99+
done
100+
101+
# Final check: Ensure all CI checks passed
102+
if [[ "$ALL_CHECKS_PASSED" == false ]]; then
103+
echo "One or more CI checks failed. Aborting merge."
104+
exit 1
105+
fi
106+
107+
echo "All CI checks passed successfully."
108+
109+
110+
- name: Check Target Branch and PR Title
111+
id: check_branch
112+
run: |
113+
PR_TITLE='${{ github.event.pull_request.title }}'
114+
echo "Original PR Title: $PR_TITLE"
115+
116+
# Escape problematic quotes
117+
ESCAPED_TITLE=$(echo "$PR_TITLE" | sed 's/"/\\"/g')
118+
echo "Escaped PR Title: $ESCAPED_TITLE"
119+
120+
if [[ "$ESCAPED_TITLE" =~ ([0-9]+\.[0-9]+\.[0-9]+).*to.*([0-9]+\.[0-9]+\.[0-9]+) ]]; then
121+
# Extract version numbers
122+
OLD_VERSION="${BASH_REMATCH[1]}"
123+
NEW_VERSION="${BASH_REMATCH[2]}"
124+
echo "Version change detected: $OLD_VERSION to $NEW_VERSION"
125+
126+
# Split version into major, minor, patch components
127+
OLD_MAJOR=$(echo "$OLD_VERSION" | cut -d '.' -f1)
128+
OLD_MINOR=$(echo "$OLD_VERSION" | cut -d '.' -f2)
129+
OLD_PATCH=$(echo "$OLD_VERSION" | cut -d '.' -f3)
130+
131+
NEW_MAJOR=$(echo "$NEW_VERSION" | cut -d '.' -f1)
132+
NEW_MINOR=$(echo "$NEW_VERSION" | cut -d '.' -f2)
133+
NEW_PATCH=$(echo "$NEW_VERSION" | cut -d '.' -f3)
134+
135+
# Check if it's a minor or patch update
136+
if [[ "$OLD_MAJOR" == "$NEW_MAJOR" ]] && [[ "$OLD_MINOR" == "$NEW_MINOR" ]] && [[ "$NEW_PATCH" -gt "$OLD_PATCH" ]]; then
137+
echo "Patch update detected"
138+
echo "should_merge=true" >> $GITHUB_ENV
139+
elif [[ "$OLD_MAJOR" == "$NEW_MAJOR" ]] && [[ "$NEW_MINOR" -gt "$OLD_MINOR" ]]; then
140+
echo "Minor update detected"
141+
echo "should_merge=true" >> $GITHUB_ENV
142+
else
143+
echo "No minor/patch update detected"
144+
echo "should_merge=false" >> $GITHUB_ENV
145+
fi
146+
else
147+
echo "No version change detected"
148+
echo "should_merge=false" >> $GITHUB_ENV
149+
fi
150+
151+
- name: Debug Context
152+
uses: actions/github-script@v6
153+
with:
154+
script: |
155+
console.log("Target branch:", context.payload.pull_request.base.ref);
156+
157+
- name: Check if Should Merge
158+
run: |
159+
echo "DEBUG: should_merge=${{ env.should_merge }}"
160+
if [[ "${{ env.should_merge }}" == "true" ]] && [[ "${{ github.event.pull_request.base.ref }}" == "Automatic_version_update_dependabot" ]]; then
161+
echo "DEBUG: should merge PR"
162+
echo "should_merge=true" >> $GITHUB_ENV
163+
else
164+
echo "DEBUG: skip merge"
165+
echo "should_merge=false" >> $GITHUB_ENV
166+
fi
167+
168+
- name: Merge Pull Request
169+
if: ${{ env.should_merge == 'true' }}
170+
uses: actions/github-script@v6
171+
with:
172+
script: |
173+
github.rest.pulls.merge({
174+
owner: context.repo.owner,
175+
repo: context.repo.repo,
176+
pull_number: context.payload.pull_request.number,
177+
merge_method: "squash"
178+
});

DigitalLearningSolutions.Data.Migrations/DigitalLearningSolutions.Data.Migrations.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Dapper" Version="2.1.24" />
20-
<PackageReference Include="FluentMigrator" Version="3.3.2" />
21-
<PackageReference Include="FluentMigrator.Extensions.SqlServer" Version="3.3.2" />
22-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
19+
<PackageReference Include="Dapper" Version="2.1.35" />
20+
<PackageReference Include="FluentMigrator" Version="6.2.0" />
21+
<PackageReference Include="FluentMigrator.Extensions.SqlServer" Version="6.2.0" />
22+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

DigitalLearningSolutions.Data.Tests/DigitalLearningSolutions.Data.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<PackageReference Include="FluentMigrator" Version="5.0.0" />
1919
<PackageReference Include="FluentMigrator.Runner" Version="5.0.0" />
2020
<PackageReference Include="FluentMigrator.Runner.SqlServer" Version="5.0.0" />
21-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.2" />
21+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.3" />
2222
<PackageReference Include="NBuilder" Version="6.1.0" />
2323
<PackageReference Include="nunit" Version="3.14.0" />
2424
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />

DigitalLearningSolutions.Web.AutomatedUiTests/DigitalLearningSolutions.Web.AutomatedUiTests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
<ItemGroup>
1010
<PackageReference Include="FluentAssertions" Version="5.10.3" />
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.25" />
11+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.0" />
1212
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
13-
<PackageReference Include="Selenium.Axe" Version="4.0.14" />
14-
<PackageReference Include="Selenium.Support" Version="4.16.2" />
15-
<PackageReference Include="Selenium.WebDriver" Version="4.16.2" />
13+
<PackageReference Include="Selenium.Axe" Version="4.0.21" />
14+
<PackageReference Include="Selenium.Support" Version="4.27.0" />
15+
<PackageReference Include="Selenium.WebDriver" Version="4.27.0" />
1616
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="122.0.6261.11100" />
17-
<PackageReference Include="xunit" Version="2.6.2" />
17+
<PackageReference Include="xunit" Version="2.9.2" />
1818
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>

DigitalLearningSolutions.Web.IntegrationTests/DigitalLearningSolutions.Web.IntegrationTests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<ItemGroup>
1010
<PackageReference Include="FakeItEasy" Version="7.4.0" />
1111
<PackageReference Include="FluentAssertions.AspNetCore.Mvc" Version="3.2.0" />
12-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.25" />
13-
<PackageReference Include="xunit" Version="2.6.2" />
12+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.0" />
13+
<PackageReference Include="xunit" Version="2.9.2" />
1414
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
<PrivateAssets>all</PrivateAssets>

DigitalLearningSolutions.Web.Tests/DigitalLearningSolutions.Web.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageReference Include="FluentAssertions.AspNetCore.Mvc" Version="3.2.0" />
1414
<PackageReference Include="NBuilder" Version="6.1.0" />
1515
<PackageReference Include="NUnit" Version="3.14.0" />
16-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
16+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
1717
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1818
</ItemGroup>
1919

DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,16 @@
6262

6363
<ItemGroup>
6464
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
65-
<PackageReference Include="FluentMigrator" Version="3.3.2" />
66-
<PackageReference Include="FluentMigrator.Runner" Version="3.3.2" />
67-
<PackageReference Include="FluentMigrator.Runner.SqlServer" Version="3.3.2" />
65+
<PackageReference Include="FluentMigrator" Version="6.2.0" />
66+
<PackageReference Include="FluentMigrator.Runner" Version="6.2.0" />
67+
<PackageReference Include="FluentMigrator.Runner.SqlServer" Version="6.2.0" />
6868
<PackageReference Include="FuzzySharp" Version="2.0.2" />
6969
<PackageReference Include="GDS.MultiPageFormData" Version="1.0.6" />
7070
<PackageReference Include="HtmlAgilityPack" Version="1.11.54" />
7171
<PackageReference Include="HtmlSanitizer" Version="8.0.795" />
7272
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.29" />
7373
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.24" />
74-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
74+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
7575
<PackageReference Include="Microsoft.FeatureManagement" Version="3.1.0" />
7676
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="2.5.1" />
7777
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.4.2">

0 commit comments

Comments
 (0)