From c0c30089b1600979a3ad8a34f82f911ba943c980 Mon Sep 17 00:00:00 2001 From: uefibot Date: Fri, 10 Jan 2025 09:00:58 +0000 Subject: [PATCH] Repo File Sync: synced file(s) with microsoft/mu_devops Signed-off-by: Project Mu UEFI Bot --- .azurepipelines/MuDevOpsWrapper.yml | 2 +- .github/release-draft-config-n-1-dev.yml | 2 +- .github/release-draft-config-n-1.yml | 2 +- .github/release-draft-config-n-dev.yml | 2 +- .github/release-draft-config-n.yml | 2 +- .github/workflows/auto-approve.yml | 2 +- .github/workflows/auto-merge.yml | 2 +- .github/workflows/issue-assignment.yml | 2 +- .github/workflows/label-issues.yml | 2 +- .github/workflows/label-sync.yml | 2 +- .github/workflows/release-draft.yml | 14 +++++------ .github/workflows/stale.yml | 2 +- .github/workflows/triage-issues.yml | 2 +- rustfmt.toml | 30 +++++++++++++----------- 14 files changed, 35 insertions(+), 33 deletions(-) diff --git a/.azurepipelines/MuDevOpsWrapper.yml b/.azurepipelines/MuDevOpsWrapper.yml index 0936c57458..4d69bd2dd8 100644 --- a/.azurepipelines/MuDevOpsWrapper.yml +++ b/.azurepipelines/MuDevOpsWrapper.yml @@ -19,7 +19,7 @@ resources: type: github endpoint: microsoft name: microsoft/mu_devops - ref: refs/tags/v12.2.0 + ref: refs/tags/v12.4.0 parameters: - name: do_ci_build diff --git a/.github/release-draft-config-n-1-dev.yml b/.github/release-draft-config-n-1-dev.yml index 7867567942..db9877233d 100644 --- a/.github/release-draft-config-n-1-dev.yml +++ b/.github/release-draft-config-n-1-dev.yml @@ -28,7 +28,7 @@ template: | $CHANGES - **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION + **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...dev-v$RESOLVED_VERSION categories: - title: '⚠️ Breaking Changes' diff --git a/.github/release-draft-config-n-1.yml b/.github/release-draft-config-n-1.yml index 027e407687..89f50f798d 100644 --- a/.github/release-draft-config-n-1.yml +++ b/.github/release-draft-config-n-1.yml @@ -29,7 +29,7 @@ template: | $CHANGES - **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION + **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...dev-v$RESOLVED_VERSION categories: - title: '⚠️ Breaking Changes' diff --git a/.github/release-draft-config-n-dev.yml b/.github/release-draft-config-n-dev.yml index 30600b1d22..f8f6c2ad1a 100644 --- a/.github/release-draft-config-n-dev.yml +++ b/.github/release-draft-config-n-dev.yml @@ -28,7 +28,7 @@ template: | $CHANGES - **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION + **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...dev-v$RESOLVED_VERSION categories: - title: '⚠️ Breaking Changes' diff --git a/.github/release-draft-config-n.yml b/.github/release-draft-config-n.yml index 1ea9bbae46..28f6ae8ee6 100644 --- a/.github/release-draft-config-n.yml +++ b/.github/release-draft-config-n.yml @@ -29,7 +29,7 @@ template: | $CHANGES - **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION + **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...dev-v$RESOLVED_VERSION categories: - title: '⚠️ Breaking Changes' diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index 1f4e5ea13a..4deb31ab3c 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -29,5 +29,5 @@ jobs: if: | github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'uefibot' - uses: microsoft/mu_devops/.github/workflows/AutoApprover.yml@v12.2.0 + uses: microsoft/mu_devops/.github/workflows/AutoApprover.yml@v12.4.0 secrets: inherit diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index c1b3184f03..784086e7dd 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -32,5 +32,5 @@ jobs: if: | github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'uefibot' - uses: microsoft/mu_devops/.github/workflows/AutoMerger.yml@v12.2.0 + uses: microsoft/mu_devops/.github/workflows/AutoMerger.yml@v12.4.0 secrets: inherit diff --git a/.github/workflows/issue-assignment.yml b/.github/workflows/issue-assignment.yml index 5087200a01..59fe556da3 100644 --- a/.github/workflows/issue-assignment.yml +++ b/.github/workflows/issue-assignment.yml @@ -23,4 +23,4 @@ jobs: contents: read issues: write - uses: microsoft/mu_devops/.github/workflows/IssueAssignment.yml@v12.2.0 + uses: microsoft/mu_devops/.github/workflows/IssueAssignment.yml@v12.4.0 diff --git a/.github/workflows/label-issues.yml b/.github/workflows/label-issues.yml index 3129c6dc76..8ce1927bac 100644 --- a/.github/workflows/label-issues.yml +++ b/.github/workflows/label-issues.yml @@ -36,4 +36,4 @@ jobs: contents: read pull-requests: write - uses: microsoft/mu_devops/.github/workflows/Labeler.yml@v12.2.0 + uses: microsoft/mu_devops/.github/workflows/Labeler.yml@v12.4.0 diff --git a/.github/workflows/label-sync.yml b/.github/workflows/label-sync.yml index 06c30d31d9..770a9b5403 100644 --- a/.github/workflows/label-sync.yml +++ b/.github/workflows/label-sync.yml @@ -28,4 +28,4 @@ jobs: permissions: issues: write - uses: microsoft/mu_devops/.github/workflows/LabelSyncer.yml@v12.2.0 + uses: microsoft/mu_devops/.github/workflows/LabelSyncer.yml@v12.4.0 diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml index bc0278e967..5426297118 100644 --- a/.github/workflows/release-draft.yml +++ b/.github/workflows/release-draft.yml @@ -21,19 +21,19 @@ name: Update Release Draft on: - push: - branches: - - dev/202405 + workflow_run: + workflows: ["Backport Commits to Release Branch"] + branches: [dev/202405] + types: + - completed jobs: - dev_draft: + draft: name: Draft Releases permissions: contents: write pull-requests: write - # The "release_drafter_update_for_release_branches" branch is temporarily being used to test release - # drafter changes on that branch in Mu Basecore before merging them into the main branch. - uses: microsoft/mu_devops/.github/workflows/ReleaseDrafter.yml@release_drafter_update_for_release_branches + uses: microsoft/mu_devops/.github/workflows/ReleaseDrafter.yml@v12.4.0 secrets: inherit diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index f155bf8bdf..bb251da502 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -29,4 +29,4 @@ jobs: issues: write pull-requests: write - uses: microsoft/mu_devops/.github/workflows/Stale.yml@v12.2.0 + uses: microsoft/mu_devops/.github/workflows/Stale.yml@v12.4.0 diff --git a/.github/workflows/triage-issues.yml b/.github/workflows/triage-issues.yml index bf71e4a5d7..8fc64734c9 100644 --- a/.github/workflows/triage-issues.yml +++ b/.github/workflows/triage-issues.yml @@ -23,4 +23,4 @@ jobs: permissions: issues: write - uses: microsoft/mu_devops/.github/workflows/IssueTriager.yml@v12.2.0 + uses: microsoft/mu_devops/.github/workflows/IssueTriager.yml@v12.4.0 diff --git a/rustfmt.toml b/rustfmt.toml index 3108b82deb..aa601abcc4 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -5,17 +5,19 @@ # Keep these options sorted in ascending order to ease lookup with rustfmt documentation. -edition = "2021" # This would normally be picked up from Cargo.toml if not specified here -force_explicit_abi = true # Always print the ABI for extern items (e.g. extern {... will become extern "C" {...) -hard_tabs = false # Always uses spaces for indentation and alignment -max_width = 120 # The maximum width of each line -merge_derives = false # Do not merge derives into a single line (leave to author discretion). -imports_granularity = "Crate" # Merge imports from a single crate into separate statements. -newline_style = "Windows" # Always use Windows line endings '\r\n' -reorder_impl_items = false # Do not force where type and const before macros and methods in impl blocks. -reorder_imports = true # Do reorder import and extern crate statements alphabetically for readability. -reorder_modules = true # Do reorder mod declarations alphabetically for readability. -tab_spaces = 4 # Use 4 spaces for indentation (Rust default). -unstable_features = false # Do not use unstable rustfmt features. -use_small_heuristics = "Max" # Set all granular width settings to the same as max_width (do not use heuristics) -wrap_comments = false # Leave comment formatting to author's discretion +edition = "2021" # This would normally be picked up from Cargo.toml if not specified here +enum_discrim_align_threshold = 8 # Vertically align enum discriminants +force_explicit_abi = true # Always print the ABI for extern items (e.g. extern {... will become extern "C" {...) +hard_tabs = false # Always uses spaces for indentation and alignment +max_width = 120 # The maximum width of each line +merge_derives = false # Do not merge derives into a single line (leave to author discretion). +imports_granularity = "Crate" # Merge imports from a single crate into separate statements. +newline_style = "Windows" # Always use Windows line endings '\r\n' +reorder_impl_items = false # Do not force where type and const before macros and methods in impl blocks. +reorder_imports = true # Do reorder import and extern crate statements alphabetically for readability. +reorder_modules = true # Do reorder mod declarations alphabetically for readability. +struct_field_align_threshold = 8 # Vertically align struct fields +tab_spaces = 4 # Use 4 spaces for indentation (Rust default). +unstable_features = false # Do not use unstable rustfmt features. +use_small_heuristics = "Max" # Set all granular width settings to the same as max_width (do not use heuristics) +wrap_comments = false # Leave comment formatting to author's discretion