Skip to content

Update version in tsh.app Info.plist#25616

Merged
camscale merged 1 commit intomasterfrom
camh/tsh-version
May 15, 2023
Merged

Update version in tsh.app Info.plist#25616
camscale merged 1 commit intomasterfrom
camh/tsh-version

Conversation

@camscale
Copy link
Copy Markdown
Contributor

@camscale camscale commented May 4, 2023

Update the version in tsh.app (tsh and tshdev) Info.plist files when
make version (make update-version) is run. If the version number has
any semver prerelease tags, then the tsh version number will be set to
"1.0", as those tags are not valid in the CFBundleShortVersionString
field. For a release without a semver tag, the value will be set.

Issue: #25085
Link: https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleshortversionstring

@github-actions github-actions Bot requested review from AntonAM and codingllama May 4, 2023 08:04
@camscale camscale marked this pull request as draft May 4, 2023 08:05
@camscale camscale force-pushed the camh/tsh-version branch 3 times, most recently from 83c2c03 to 4b4f38b Compare May 4, 2023 08:09
@camscale camscale marked this pull request as ready for review May 4, 2023 08:09
@github-actions github-actions Bot requested review from Tener and jakule May 4, 2023 08:09
@camscale camscale removed request for Tener and jakule May 4, 2023 08:12
@camscale
Copy link
Copy Markdown
Contributor Author

camscale commented May 4, 2023

I had thought that gawk was installed by default on Mac. It seems not. I will probably have to re-work this to work with standard awk (I was relying on -i inplace from gawk to avoid temp files).

@camscale camscale force-pushed the camh/tsh-version branch from 4b4f38b to 7385223 Compare May 4, 2023 08:19
@camscale
Copy link
Copy Markdown
Contributor Author

camscale commented May 4, 2023

Ok, I've updated to use awk and tested on Mac. All good now.

@camscale camscale requested a review from r0mant May 4, 2023 08:20
@camscale camscale force-pushed the camh/tsh-version branch from 7385223 to 8d90e0e Compare May 4, 2023 12:43
Copy link
Copy Markdown
Contributor

@codingllama codingllama left a comment

Choose a reason for hiding this comment

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

Thanks for addressing #25085, Cam. It was on my radar as well, but I wouldn't get to it very quickly.

Comment thread version.mk Outdated
Comment thread version.mk Outdated
@codingllama
Copy link
Copy Markdown
Contributor

Added backport tags for all active releases.

@camscale camscale force-pushed the camh/tsh-version branch 2 times, most recently from 0a49775 to 8998b38 Compare May 11, 2023 07:02
@camscale
Copy link
Copy Markdown
Contributor Author

@codingllama @r0mant @AntonAM I've revved this PR to now use a Go program to update the plist files. PTAL

Copy link
Copy Markdown
Contributor

@codingllama codingllama left a comment

Choose a reason for hiding this comment

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

Thanks for the version update program, looks much more solid than before.

Comment thread build.assets/tooling/go.mod Outdated
Comment thread build.assets/tooling/go.mod Outdated
Comment thread build.assets/tooling/cmd/update-plist-version/main.go Outdated
Comment thread build.assets/tooling/cmd/update-plist-version/main.go Outdated
Comment thread build.assets/tooling/cmd/update-plist-version/main.go Outdated
Comment thread build.assets/tooling/cmd/update-plist-version/main.go Outdated
Comment thread build.assets/tooling/cmd/update-plist-version/main.go Outdated
Comment thread build.assets/tooling/cmd/update-plist-version/main.go Outdated
Comment thread build.assets/tooling/cmd/update-plist-version/main.go Outdated
Copy link
Copy Markdown
Contributor

@codingllama codingllama left a comment

Choose a reason for hiding this comment

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

Thanks for the version update program, looks much more solid than before.

@camscale
Copy link
Copy Markdown
Contributor Author

@r0mant @AntonAM I've done the rounds with Alan. Mind taking a look for second review?

@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from r0mant May 15, 2023 22:21
Update the version in tsh.app (tsh and tshdev) `Info.plist` files when
`make version` (`make update-version`) is run. If the version number has
any semver prerelease tags, then the tsh version number will be set to
"1.0", as those tags are not valid in the CFBundleShortVersionString or
CFBundleVersion fields. For a release without a semver tag, the value
will be set.

This will update the CFBundleVersion and CFBundleShortVersionString
fields of the `Info.plist` file.

This commit contains re-written plist files as they get reindented by
the tool, the CFBundleVersion becomes "1.0" (was "1") and one empty
element is shortened to the empty-element form.

Link: https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleversion
Link: https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleshortversionstring
@camscale camscale force-pushed the camh/tsh-version branch from 886eb6d to c64193b Compare May 15, 2023 22:25
@camscale camscale enabled auto-merge May 15, 2023 22:25
@camscale camscale added this pull request to the merge queue May 15, 2023
Merged via the queue into master with commit 49ab2a7 May 15, 2023
@camscale camscale deleted the camh/tsh-version branch May 15, 2023 23:00
@public-teleport-github-review-bot
Copy link
Copy Markdown

@camscale See the table below for backport results.

Branch Result
branch/v10 Failed
branch/v11 Failed
branch/v12 Failed
branch/v13 Create PR

@camscale
Copy link
Copy Markdown
Contributor Author

Remove v10 backport label as that is no longer a supported release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants