diff --git a/.github/release-draft-config-n-1.yml b/.github/release-draft-config-n-1.yml index 027e407687..fcf38acfbd 100644 --- a/.github/release-draft-config-n-1.yml +++ b/.github/release-draft-config-n-1.yml @@ -17,12 +17,11 @@ # For more information, see: # https://github.com/release-drafter/release-drafter -name-template: 'dev-v$RESOLVED_VERSION' -tag-template: 'dev-v$RESOLVED_VERSION' +name-template: 'v$RESOLVED_VERSION' +tag-template: 'v$RESOLVED_VERSION' -commitish: refs/heads/dev/202311 +commitish: refs/heads/release/202311 filter-by-commitish: true -include-labels: ["type:backport"] template: | # What's Changed diff --git a/.github/release-draft-config-n.yml b/.github/release-draft-config-n.yml index 1ea9bbae46..b4fd801fee 100644 --- a/.github/release-draft-config-n.yml +++ b/.github/release-draft-config-n.yml @@ -17,12 +17,11 @@ # For more information, see: # https://github.com/release-drafter/release-drafter -name-template: 'dev-v$RESOLVED_VERSION' -tag-template: 'dev-v$RESOLVED_VERSION' +name-template: 'v$RESOLVED_VERSION' +tag-template: 'v$RESOLVED_VERSION' -commitish: refs/heads/dev/202405 +commitish: refs/heads/release/202405 filter-by-commitish: true -include-labels: ["type:backport"] template: | # What's Changed diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml index bc0278e967..dbe5cb9a8e 100644 --- a/.github/workflows/release-draft.yml +++ b/.github/workflows/release-draft.yml @@ -23,17 +23,14 @@ name: Update Release Draft on: push: branches: - - dev/202405 + - release/202405 jobs: - dev_draft: - name: Draft Releases + draft: 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.2.0 secrets: inherit 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