Skip to content

Commit 7a63a7e

Browse files
tigdependabot[bot]CopilotCopilot
authored
Fixes #5114. Remove main from publish branch triggers; use tags only (#5115)
* Bump ReportGenerator from 5.5.5 to 5.5.6 --- updated-dependencies: - dependency-name: ReportGenerator dependency-version: 5.5.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update Examples link in README.md (#5104) * Reframe layout docs around responsive UI and instructional style (#5110) * Initial plan * docs: reframe layout docs around responsive UI Agent-Logs-Url: https://github.com/gui-cs/Terminal.Gui/sessions/a6b913bd-38e5-4d80-ac23-9dc8e6716045 Co-authored-by: tig <585482+tig@users.noreply.github.com> * docs: polish responsive layout wording Agent-Logs-Url: https://github.com/gui-cs/Terminal.Gui/sessions/a6b913bd-38e5-4d80-ac23-9dc8e6716045 Co-authored-by: tig <585482+tig@users.noreply.github.com> * docs: tighten instructional sentence style Agent-Logs-Url: https://github.com/gui-cs/Terminal.Gui/sessions/d453216b-6d43-4261-aa23-0dad98805e91 Co-authored-by: tig <585482+tig@users.noreply.github.com> * docs: fix remaining instructional prose Agent-Logs-Url: https://github.com/gui-cs/Terminal.Gui/sessions/d7be6123-896e-4b95-8e3f-0cee1d6d35d1 Co-authored-by: tig <585482+tig@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: tig <585482+tig@users.noreply.github.com> * Fixes #5114. Remove main from publish branch triggers; use tags only Main branch pushes were triggering the publish workflow without a release tag, causing GitVersion to produce invalid NuGet versions (e.g. 2.0.0-5420). - Remove main from branches trigger; stable releases now publish only on v* tag push - Develop branch pushes continue publishing pre-release packages automatically - Update template dispatch conditions to match tag-based flow Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: tig <585482+tig@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent ecb13a8 commit 7a63a7e

3 files changed

Lines changed: 18 additions & 16 deletions

File tree

.github/workflows/publish.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: Publish Terminal.Gui to Nuget
22

33
on:
44
push:
5-
branches: [ main, develop ]
5+
# Main releases are triggered only by pushing a v* tag (e.g., v2.0.0).
6+
# Develop pushes publish pre-release packages (e.g., 2.1.0-develop.1).
7+
branches: [ develop ]
68
tags:
79
- v*
810
paths-ignore:
@@ -71,21 +73,21 @@ jobs:
7173
run: dotnet nuget push Terminal.Gui/bin/Release/Terminal.Gui.${{ steps.gitversion.outputs.SemVer }}.nupkg --skip-duplicate --api-key ${{ secrets.NUGET_API_KEY }}
7274

7375
# - name: Delist old NuGet packages
74-
# if: github.ref == 'refs/heads/main'
76+
# if: startsWith(github.ref, 'refs/tags/v')
7577
# shell: pwsh
7678
# run: |
7779
# $version = "${{ steps.gitversion.outputs.SemVer }}"
7880
# Write-Host "Running delist script for just-published version: $version"
7981
# ./Scripts/delist-nuget.ps1 -ApiKey "${{ secrets.NUGET_API_KEY }}" -JustPublishedVersion "$version"
8082

8183
- name: Prepare payload for template dispatch
82-
if: github.ref == 'refs/heads/main'
84+
if: startsWith(github.ref, 'refs/tags/v')
8385
id: payload
8486
run: |
8587
echo "json={\"version\":\"${{ steps.gitversion.outputs.SemVer }}\"}" >> $GITHUB_OUTPUT
8688
8789
- name: Trigger Terminal.Gui.templates update
88-
if: github.ref == 'refs/heads/main'
90+
if: startsWith(github.ref, 'refs/tags/v')
8991
uses: peter-evans/repository-dispatch@v4
9092
with:
9193
token: ${{ secrets.TEMPLATE_REPO_TOKEN }}

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<PackageVersion Include="Moq" Version="4.20.72" />
4141
<PackageVersion Include="Markdig" Version="1.1.3" />
4242
<PackageVersion Include="TextMateSharp.Grammars" Version="2.0.3" />
43-
<PackageVersion Include="ReportGenerator" Version="5.5.5" />
43+
<PackageVersion Include="ReportGenerator" Version="5.5.6" />
4444
<PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.1.1" />
4545
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
4646
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />

docfx/docs/layout.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ Label absoluteLabel = new () { X = 1, Y = 2, Width = 12, Height = 1, Text = "Abs
158158
Label responsiveLabel = new ()
159159
{
160160
Text = "Responsive",
161-
X = Pos.Right (absoluteLabel),
161+
X = Pos.Right (otherView),
162162
Y = Pos.Center (),
163163
Width = Dim.Fill (),
164164
Height = Dim.Percent (50)
@@ -169,13 +169,13 @@ Label responsiveLabel = new ()
169169

170170
<xref:Terminal.Gui.ViewBase.Pos> is the type of `View.X` and `View.Y`. To make a view's position respond to available space or other views instead of using a fixed coordinate, use it.
171171

172-
* Absolute position, by passing an integer - `Pos.Absolute (10)` or simply `X = 10`
173-
* Percentage of the `SuperView` size - `Pos.Percent (50)`
174-
* Anchored from the end of the dimension - `Pos.AnchorEnd (10)`
172+
* Absolute position, by passing an integer - `Pos.Absolute ()`
173+
* Percentage of the `SuperView` size - `Pos.Percent ()`
174+
* Anchored from the end of the dimension - `Pos.AnchorEnd ()`
175175
* Centered - `Pos.Center ()`
176-
* Tracking another view - `Pos.Left (otherView)`, `Pos.Right (otherView)`, `Pos.Top (otherView)`, `Pos.Bottom (otherView)`
177-
* Aligning as a group - `Pos.Align (...)`
178-
* Computing from a function - `Pos.Func (...)`
176+
* Tracking another view - `Pos.Left ()`, `Pos.Right ()`, `Pos.Top ()`, `Pos.Bottom ()`
177+
* Aligning as a group - `Pos.Align ()`
178+
* Computing from a function - `Pos.Func ()`
179179

180180
All <xref:Terminal.Gui.ViewBase.Pos> coordinates are relative to the SuperView's content area.
181181

@@ -197,12 +197,12 @@ myView.Y = Pos.Bottom (anotherView) + 5;
197197
<xref:Terminal.Gui.ViewBase.Dim> is the type of `View.Width` and `View.Height`. To make size respond to content, terminal size, or sibling views instead of using a fixed number of cells, use it.
198198

199199
* Automatic size based on the view's content - `Dim.Auto ()` - See [Dim.Auto Deep Dive](dimauto.md)
200-
* Absolute size, by passing an integer - `Dim.Absolute (10)`
201-
* Percentage of the `SuperView` content area - `Dim.Percent (50)`
200+
* Absolute size, by passing an integer - `Dim.Absolute ()`
201+
* Percentage of the `SuperView` content area - `Dim.Percent ()`
202202
* Fill the remaining space - `Dim.Fill ()`
203203
* Fill up to another view - `Dim.Fill (to: otherView)`
204-
* Track another view's size - `Dim.Width (otherView)`, `Dim.Height (otherView)`
205-
* Compute from a function - `Dim.Func (() => 10)`
204+
* Track another view's size - `Dim.Width ()`, `Dim.Height ()`
205+
* Compute from a function - `Dim.Func ()`
206206

207207
`Dim.Fill ()` is especially useful for responsive forms and panes. **Note:** `Dim.Fill` does not contribute to a `SuperView`'s `Dim.Auto ()` sizing unless `minimumContentDim` is specified. See [Dim.Auto Deep Dive](dimauto.md) for details.
208208

0 commit comments

Comments
 (0)