Skip to content

Commit

Permalink
Merge branch 'main' into feature/9.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jander-msft authored Jan 30, 2025
2 parents 60e8ba4 + e656837 commit fe91b3b
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 16 deletions.
3 changes: 2 additions & 1 deletion .github/dependabot.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
#@ def getBranches():
#@ return [
#@ struct.encode({"name": "main", "majorVersion": "8"}),
#@ struct.encode({"name": "feature/9.x", "majorVersion": "9"}),
#@ struct.encode({"name": "release/9.x", "majorVersion": "9"}),
#@ struct.encode({"name": "release/8.x", "majorVersion": "8"}),
#@ struct.encode({"name": "release/8.0", "majorVersion": "8"}),
#@ ]
#@ end
Expand Down
104 changes: 92 additions & 12 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ updates:
directory: /eng/dependabot/independent
schedule:
interval: daily
target-branch: feature/9.x
target-branch: release/9.x
ignore:
- dependency-name: Microsoft.Extensions.*
update-types:
- version-update:semver-major
- dependency-name: Moq
commit-message:
prefix: '[feature/9.x] '
prefix: '[release/9.x] '
groups:
azure-sdk-dependencies:
patterns:
Expand All @@ -111,20 +111,20 @@ updates:
directory: /eng/dependabot/nuget.org
schedule:
interval: daily
target-branch: feature/9.x
target-branch: release/9.x
commit-message:
prefix: '[feature/9.x] '
prefix: '[release/9.x] '
- package-ecosystem: nuget
directory: /eng/dependabot/net9.0
schedule:
interval: daily
target-branch: feature/9.x
target-branch: release/9.x
ignore:
- dependency-name: '*'
update-types:
- version-update:semver-major
commit-message:
prefix: '[feature/9.x] '
prefix: '[release/9.x] '
groups:
runtime-dependencies:
patterns:
Expand All @@ -135,13 +135,13 @@ updates:
directory: /eng/dependabot/net8.0
schedule:
interval: daily
target-branch: feature/9.x
target-branch: release/9.x
ignore:
- dependency-name: '*'
update-types:
- version-update:semver-major
commit-message:
prefix: '[feature/9.x] '
prefix: '[release/9.x] '
groups:
runtime-dependencies:
patterns:
Expand All @@ -152,13 +152,13 @@ updates:
directory: /eng/dependabot/net7.0
schedule:
interval: daily
target-branch: feature/9.x
target-branch: release/9.x
ignore:
- dependency-name: '*'
update-types:
- version-update:semver-major
commit-message:
prefix: '[feature/9.x] '
prefix: '[release/9.x] '
groups:
runtime-dependencies:
patterns:
Expand All @@ -169,13 +169,93 @@ updates:
directory: /eng/dependabot/net6.0
schedule:
interval: daily
target-branch: feature/9.x
target-branch: release/9.x
ignore:
- dependency-name: '*'
update-types:
- version-update:semver-major
commit-message:
prefix: '[feature/9.x] '
prefix: '[release/9.x] '
groups:
runtime-dependencies:
patterns:
- Microsoft.Extensions.*
- Microsoft.NETCore.DotNetHost
- System.Text.Json
- package-ecosystem: nuget
directory: /eng/dependabot/independent
schedule:
interval: daily
target-branch: release/8.x
ignore:
- dependency-name: Microsoft.Extensions.*
update-types:
- version-update:semver-major
- dependency-name: Moq
commit-message:
prefix: '[release/8.x] '
groups:
azure-sdk-dependencies:
patterns:
- Azure.Core
- Azure.Identity
- Azure.Storage.*
identity-dependencies:
patterns:
- Microsoft.Identity.*
- Microsoft.IdentityModel.*
- package-ecosystem: nuget
directory: /eng/dependabot/nuget.org
schedule:
interval: daily
target-branch: release/8.x
commit-message:
prefix: '[release/8.x] '
- package-ecosystem: nuget
directory: /eng/dependabot/net8.0
schedule:
interval: daily
target-branch: release/8.x
ignore:
- dependency-name: '*'
update-types:
- version-update:semver-major
commit-message:
prefix: '[release/8.x] '
groups:
runtime-dependencies:
patterns:
- Microsoft.Extensions.*
- Microsoft.NETCore.DotNetHost
- System.Text.Json
- package-ecosystem: nuget
directory: /eng/dependabot/net7.0
schedule:
interval: daily
target-branch: release/8.x
ignore:
- dependency-name: '*'
update-types:
- version-update:semver-major
commit-message:
prefix: '[release/8.x] '
groups:
runtime-dependencies:
patterns:
- Microsoft.Extensions.*
- Microsoft.NETCore.DotNetHost
- System.Text.Json
- package-ecosystem: nuget
directory: /eng/dependabot/net6.0
schedule:
interval: daily
target-branch: release/8.x
ignore:
- dependency-name: '*'
update-types:
- version-update:semver-major
commit-message:
prefix: '[release/8.x] '
groups:
runtime-dependencies:
patterns:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scan-for-to-do-comments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
COMMENT_AUTHOR: ${{ github.event.comment.user.login }}

- name: Upload artifacts
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
with:
name: issue-todo
path: issue/
2 changes: 1 addition & 1 deletion .github/workflows/submit-to-do-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
# The default artifact download action doesn't support cross-workflow
# artifacts, so use a 3rd party one.
- name: 'Download linting results'
uses: dawidd6/action-download-artifact@80620a5d27ce0ae443b965134db88467fc607b43
uses: dawidd6/action-download-artifact@20319c5641d495c8a52e688b7dc5fada6c3a9fbc
with:
workflow: ${{env.workflow_name}}
run_id: ${{github.event.workflow_run.id }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-dependabot-clearly-defined.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- name: Fetch Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@dbb049abf0d677abbd7f7eee0375145b417fdd34
uses: dependabot/fetch-metadata@d7267f607e9d3fb96fc2fbe83e0af444713e90b7

- name: Check ClearlyDefined
if: ${{steps.metadata.outputs.package-ecosystem == 'nuget'}}
Expand Down

0 comments on commit fe91b3b

Please sign in to comment.