Skip to content

Commit b71dda3

Browse files
committed
Merge branch 'DLS-Release-v1.1.2' into UAT
2 parents f2b006a + 764d023 commit b71dda3

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

.github/dependabot.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,35 @@
44
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
55

66
version: 2
7+
registries:
8+
tel-azure-package-source:
9+
type: nuget-feed
10+
url: "https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json"
11+
username: "kevin.whittaker"
12+
password: ${{ secrets.AZURE_DEVOPS_PAT }}
13+
nuget-package-source:
14+
type: nuget-feed
15+
url: "https://api.nuget.org/v3/index.json"
716
updates:
817
- package-ecosystem: "nuget"
918
directory: "/" # Location of package manifests
1019
schedule:
1120
interval: "daily"
1221
open-pull-requests-limit: 10
22+
registries:
23+
- tel-azure-package-source
24+
- nuget-package-source
1325
target-branch: "Automatic_version_update_dependabot"
1426
ignore:
1527
# Ignore updates to packages that start with 'Wildcards'
1628
- dependency-name: "Microsoft.FeatureManagement.AspNetCore*"
1729
# Ignore some updates to the package
1830
- dependency-name: "Microsoft.VisualStudio.Web.CodeGeneration.Design"
19-
versions: [">7.0.0"]
31+
versions: [">9.0.0"]
2032
- dependency-name: "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"
21-
versions: [">7.0.0"]
33+
versions: [">9.0.0"]
2234
- dependency-name: "Microsoft.AspNetCore.Mvc.Testing"
23-
versions: [">7.0.0"]
35+
versions: [">9.0.0"]
2436
- dependency-name: "Selenium.WebDriver.ChromeDriver"
2537
versions: ">=113.0.5672.1278" # Recommended version
2638
# For all packages, ignore all patch updates
@@ -34,7 +46,7 @@ updates:
3446
interval: "daily"
3547
target-branch: "Automatic_version_update_dependabot"
3648
# - "dependencies"
37-
open-pull-requests-limit: 7
49+
open-pull-requests-limit: 10
3850
ignore:
3951
- dependency-name: "*"
4052
update-types: ["version-update:semver-major"]

.github/workflows/auto-merge.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,12 @@ jobs:
6969
echo "Skipping 'auto-merge' workflow check to prevent self-referencing."
7070
continue
7171
fi
72-
72+
73+
# If any check is still queued, set ALL_COMPLETED to false
74+
if [[ "$status" == "QUEUED" ]]; then
75+
ALL_COMPLETED=false
76+
fi
77+
7378
# If any check is still in progress, set ALL_COMPLETED to false
7479
if [[ "$status" == "IN_PROGRESS" ]]; then
7580
ALL_COMPLETED=false

0 commit comments

Comments
 (0)