diff --git a/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml b/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml
index 6021872..9e3d50b 100644
--- a/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml
+++ b/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml
@@ -1,19 +1,38 @@
+# qqqq in development
# This script seperate major and minor but we do merge them into the same branch.
# Having two steps allows us to easily turn off major changes in future and then script them to their own branch and pipeline.
name: Auto-merge Dependabot PRs into collected branch
on:
pull_request:
- types: [opened, synchronize]
+ # synchronize
+ types: [opened]
branches: [Automatic_version_update_dependabot] # Make sure this matches your actual branch name
-
+ check_suite:
+ types: [completed]
+ workflow_dispatch:
permissions:
contents: write
pull-requests: write
jobs:
+ debug:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Debug info
+ run: |
+ echo "Actor: ${{ github.actor }}"
+ echo "PR Title: ${{ github.event.pull_request.title }}"
+ echo "Target Branch: ${{ github.event.pull_request.base.ref }}"
+ echo "Source Branch: ${{ github.event.pull_request.head.ref }}"
+ - name: Wait for other checks to start
+ - name: Delay for check
+ run: |
+ # drop later qqqq shouldnt need but its running before auto
+ echo "Waiting 4 minutes for other checks to start running..."
+ sleep 240
auto-merge:
runs-on: ubuntu-latest
- if: github.actor == 'dependabot[bot]'
+ if: github.actor == 'dependabot[bot]' || github.event_name == 'workflow_dispatch'
steps:
- name: Extract update type
id: extract
@@ -27,6 +46,7 @@ jobs:
- 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
run: gh pr merge --auto --squash "${{ github.event.pull_request.html_url }}"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/collected-dependabot-staging-to-master.yml b/.github/workflows/collected-dependabot-staging-to-master.yml
index 822ba31..fbb0e0f 100644
--- a/.github/workflows/collected-dependabot-staging-to-master.yml
+++ b/.github/workflows/collected-dependabot-staging-to-master.yml
@@ -1,3 +1,4 @@
+# qqqq in development
name: Collected Dependabot Promotion From Staging To Master
on:
schedule:
diff --git a/.github/workflows/collected-dependabot-to-staging.yml b/.github/workflows/collected-dependabot-to-staging.yml
index 4306f22..c0a0376 100644
--- a/.github/workflows/collected-dependabot-to-staging.yml
+++ b/.github/workflows/collected-dependabot-to-staging.yml
@@ -1,3 +1,4 @@
+# qqqq in development
name: Dependabot Collected Promotion To Staging
# this logic will require branch ruleset checks of running the dev pipeline
on:
diff --git a/Directory.Packages.props b/Directory.Packages.props
index e75535d..9cf7c12 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -28,15 +28,15 @@
-
+
-
-
+
+
diff --git a/TELBlazor.Components.UnitTests/packages.lock.json b/TELBlazor.Components.UnitTests/packages.lock.json
index 2df466b..b59936a 100644
--- a/TELBlazor.Components.UnitTests/packages.lock.json
+++ b/TELBlazor.Components.UnitTests/packages.lock.json
@@ -56,9 +56,9 @@
},
"Serilog": {
"type": "Direct",
- "requested": "[4.2.0, )",
- "resolved": "4.2.0",
- "contentHash": "gmoWVOvKgbME8TYR+gwMf7osROiWAURterc6Rt2dQyX7wtjZYpqFiA/pY6ztjGQKKV62GGCyOcmtP1UKMHgSmA=="
+ "requested": "[4.3.0, )",
+ "resolved": "4.3.0",
+ "contentHash": "+cDryFR0GRhsGOnZSKwaDzRRl4MupvJ42FhCE4zhQRVanX0Jpg6WuCBk59OVhVDPmab1bB+nRykAnykYELA9qQ=="
},
"Serilog.Expressions": {
"type": "Direct",
@@ -111,20 +111,20 @@
},
"Serilog.Sinks.InMemory": {
"type": "Direct",
- "requested": "[0.14.0, )",
- "resolved": "0.14.0",
- "contentHash": "6xsQEkx1ZlH19/6id6rNTZyi5cXghji/NJke+Uu3GP9LlY28+RmR7C4kKWtvoH55eXVsZdLQz5j4uCaT+ceaRA==",
+ "requested": "[2.0.0, )",
+ "resolved": "2.0.0",
+ "contentHash": "4BbZBd8OBiMnNg4jFQ3YSC5CO0NaA1GBGwvI1Scoeq9zxZ8vQ6q2YLQuR3ndc0YzCfME2jtV8/IgvB5UaKGwGw==",
"dependencies": {
- "Serilog": "2.12.0"
+ "Serilog": "4.3.0"
}
},
"Serilog.Sinks.InMemory.Assertions": {
"type": "Direct",
- "requested": "[0.14.0, )",
- "resolved": "0.14.0",
- "contentHash": "1Glb4GQyIsnxGO0u/P+jIkm6x6YKjvGOIOtG5zb8OX3XUJxjyrti7iojYEWSaCzXKchwSvuYdRb494Flfo5oYw==",
+ "requested": "[2.0.0, )",
+ "resolved": "2.0.0",
+ "contentHash": "sBSwTODz/hbSzHKgF5dwrrVLKqXHtzTGVL4GAtqG3n+7rCzrZwtV3VGteGAl5WkK2Vz2QzXx+R9s5Y0HJirkGA==",
"dependencies": {
- "Serilog.Sinks.InMemory": "0.14.0"
+ "Serilog.Sinks.InMemory": "2.0.0"
}
},
"Serilog.Sinks.XUnit": {
@@ -139,6 +139,16 @@
"xunit.core": "2.4.1"
}
},
+ "TELBlazor.Components": {
+ "type": "Direct",
+ "requested": "(, )",
+ "resolved": "1.0.0",
+ "contentHash": "mkjzSgfupUrrAp57hk/4MOkFZwJRgw8a5oYhjotD0/NyPBhUPZ51z0G2Zd9owZ+CruScSmRngAvBiBAMJS7HCw==",
+ "dependencies": {
+ "Microsoft.AspNetCore.Components.Web": "8.0.14",
+ "Microsoft.Extensions.Http": "8.0.0"
+ }
+ },
"xunit": {
"type": "Direct",
"requested": "[2.9.0, )",
@@ -1666,24 +1676,6 @@
"xunit.extensibility.core": "[2.9.0]"
}
},
- "telblazor.components": {
- "type": "Project",
- "dependencies": {
- "Blazored.LocalStorage": "[4.5.0, )",
- "Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
- "Microsoft.Extensions.Http": "[8.0.1, )",
- "Serilog": "[4.2.0, )"
- }
- },
- "Blazored.LocalStorage": {
- "type": "CentralTransitive",
- "requested": "[4.5.0, )",
- "resolved": "4.5.0",
- "contentHash": "6nZuJwA7zNIKx83IsObiHXZb09ponJOpCClU3en+hI8ZFvrOKXeOw+H7TegQZQrvdR1n9fkrVkEBQZg8vx6ZTw==",
- "dependencies": {
- "Microsoft.AspNetCore.Components.Web": "8.0.0"
- }
- },
"Microsoft.AspNetCore.Components.Web": {
"type": "CentralTransitive",
"requested": "[8.0.14, )",