8000 tests/checks: version: Relax regular expression for valid versions by Conan-Kudo · Pull Request #11173 · fish-shell/fish-shell · GitHub
[go: up one dir, main page]
Skip to content

tests/checks: version: Relax regular expression for valid versions#11173

Closed
Conan-Kudo wants to merge 1 commit intofish-shell:masterfrom
Conan-Kudo:fix-version-check-for-packaging
Closed

tests/checks: version: Relax regular expression for valid versions#11173
Conan-Kudo wants to merge 1 commit intofish-shell:masterfrom
Conan-Kudo:fix-version-check-for-packaging

Conversation

@Conan-Kudo
Copy link
@Conan-Kudo Conan-Kudo commented Feb 26, 2025

This relaxes the regular expression determining valid version strings such that packaging version strings used by Fedora and other Linux distributions can be successfully embedded.

This is related to #10633 work.

@Conan-Kudo Conan-Kudo mentioned this pull request Feb 26, 2025
Merged
3 tasks
@Conan-Kudo
tests/checks: version: Relax regular expression for valid versions
f08adc6 
This allows distribution package versioning (as used in Fedora Linux
and other Linux distributions) to be correctly used throughout the
program.
@Conan-Kudo Conan-Kudo force-pushed the fix-version-check-for-packaging branch from 7627b4f to f08adc6 Compare February 26, 2025 20:11
@Conan-Kudo Conan-Kudo mentioned this pull request Feb 26, 2025
Closed
25 tasks
@zanchey
Copy link
Member
zanchey commented Feb 27, 2025

packaging version strings used by Fedora

Can you give me some context? How are these being used/embedded?

@zanchey zanchey added this to the fish 4.1 milestone Feb 27, 2025
@Conan-Kudo
Copy link
Author
Conan-Kudo commented Feb 27, 2025

Sure. The version of fish being packaged right now that includes this patch is 4.0.0~beta.1^git1.b82d0fcbcc4. This gets embedded in via the version file so that when you ask fish what version it is, it reports the exact one that is used for the packaging itself.

@faho
Copy link
Member
faho commented Mar 1, 2025

At that point, I think we could just make it something like fish, version {{[0-9].*}} - just see that the version starts with a digit.

We added that test because packagers managed to build a package that said "fish, version unknown" IIRC.

faho added a commit that referenced this pull request Mar 15, 2025
@faho
tests: Just check that the version starts with a digit
411a396 
Our versions look like

4.0.0
4.0b1
4.0.1-535-abfef-dirty

But packagers may want to add more information here, and we don't
really care. Note that we no longer ever set the version to "unknown"
since 5abd0e4.

Supersedes #11173
@faho
Copy link
Member
faho commented Mar 15, 2025

Alright, I made it just require a leading digit.

@faho faho closed this Mar 15, 2025
faho added a commit that referenced this pull request Apr 2, 2025
@faho
tests: Just check th 7BF2 at the version starts with a digit
ba49981 
Our versions look like

4.0.0
4.0b1
4.0.1-535-abfef-dirty

But packagers may want to add more information here, and we don't
really care. Note that we no longer ever set the version to "unknown"
since 5abd0e4.

Supersedes #11173

(cherry picked from commit 411a396)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

enhancement

Projects

None yet

Milestone

fish 4.1

Development

Successfully merging this pull request may close these issues.

3 participants

@Conan-Kudo @zanchey @faho
0