Skip to content

Commit

Permalink
build: pass branding into the nuget variable template (#16122)
Browse files Browse the repository at this point in the history 
This fixes a cosmetic issue with the version number in the unpackaged
builds and NuGet packages.

They were showing up as `-preview`, even when they were stable, because
the variable template didn't know about the branding.

(cherry picked from commit 544cdd7)
Service-Card-Id: 91211923
Service-Version: 1.17
  • Loading branch information
@DHowett
DHowett committed Nov 28, 2023
1 parent 086c388 commit 11cf895
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 0 deletions.
2 changes: 2 additions & 0 deletions build/pipelines/ob-nightly.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)

variables:
- template: templates-v2/variables-nuget-package-version.yml
parameters:
branding: Canary
- template: templates-v2/variables-onebranch-config.yml

extends:
Expand Down
2 changes: 2 additions & 0 deletions build/pipelines/ob-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)

variables:
- template: templates-v2/variables-nuget-package-version.yml
parameters:
branding: ${{ parameters.branding }}
- template: templates-v2/variables-onebranch-config.yml

extends:
Expand Down
2 changes: 2 additions & 0 deletions build/pipelines/templates-v2/pipeline-full-release-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ parameters:

variables:
- template: variables-nuget-package-version.yml
parameters:
branding: ${{ parameters.branding }}

resources:
repositories:
Expand Down
4 changes: 4 additions & 0 deletions build/pipelines/templates-v2/variables-nuget-package-version.yml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
parameters:
- name: branding
type: string

variables:
# If we are building a branch called "release-*", change the NuGet suffix
# to "preview". If we don't do that, XES will set the suffix to "release1"
Expand Down

1 comment on commit 11cf895

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@check-spelling-bot Report

🔴 Please review

See the 📜action log for details.

Unrecognized words (4)

LASTEXITCODE
NULs
spand
xwwyzz

Previously acknowledged words that are now absent ACCESSTOKEN BUILDURI CLA COLLECTIONURI countof demoable dhandler dmp etcoreapp everytime fileurl HKLM homeglyphs inthread IXMP lastexitcode listproperties logissue minimizeall preinstalled procs reingest SOURCEBRANCH suiteless TEAMPROJECT testbuildplatform testdlls testmode testnameprefix testtimeout unmark untests :arrow_right:
To accept ✔️ these unrecognized words as correct and remove the previously acknowledged and now absent words, run the following commands

... in a clone of the git@github.com:microsoft/terminal.git repository
on the release-1.17 branch (ℹ️ how do I use this?):

curl -s -S -L 'https://raw.githubusercontent.com/check-spelling/check-spelling/v0.0.21/apply.pl' |
perl - 'https://github.com/microsoft/terminal/actions/runs/7023411777/attempts/1'
Pattern suggestions ✂️ (1)

You could add these patterns to .github/actions/spelling/patterns/11cf895e172498e393e8071e8fd7e62cac9b71a6.txt:

# Automatically suggested patterns
# hit-count: 1 file-count: 1
# Punycode
\bxn--[-0-9a-z]+
Warnings (1)

See the 📜action log for details.

ℹ️ Warnings Count
ℹ️ candidate-pattern 1

See ℹ️ Event descriptions for more information.

✏️ Contributor please read this

By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.

⚠️ The command is written for posix shells. If it doesn't work for you, you can manually add (one word per line) / remove items to expect.txt and the excludes.txt files.

If the listed items are:

  • ... misspelled, then please correct them instead of using the command.
  • ... names, please add them to .github/actions/spelling/allow/names.txt.
  • ... APIs, you can add them to a file in .github/actions/spelling/allow/.
  • ... just things you're using, please add them to an appropriate file in .github/actions/spelling/expect/.
  • ... tokens you only need in one place and shouldn't generally be used, you can add an item in an appropriate file in .github/actions/spelling/patterns/.

See the README.md in each directory for more information.

🔬 You can test your commits without appending to a PR by creating a new branch with that extra change and pushing it to your fork. The check-spelling action will run in response to your push -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. 😉

If the flagged items are 🤯 false positives

If items relate to a ...

  • binary file (or some other file you wouldn't want to check at all).

    Please add a file path to the excludes.txt file matching the containing file.

    File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

    ^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

  • well-formed pattern.

    If you can write a pattern that would match it,
    try adding it to the patterns.txt file.

    Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

    Note that patterns can't match multiline strings.

Please sign in to comment.