Skip to content

Local semver#681

Merged
mcarans merged 56 commits into
masterfrom
localSemver
Jun 23, 2026
Merged

Local semver#681
mcarans merged 56 commits into
masterfrom
localSemver

Conversation

@oocube

@oocube oocube commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

Fixes #676 by introducing semver to local builds and adding the BUILDER environment variable.

@mcarans mcarans left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for looking into this. It's a step in the right direction. See my comments for some requested changes

Comment thread ShellScripts/Linux/download_github.sh Outdated
Comment thread .github/workflows/build-all.yaml Outdated
Comment thread src/SDL/MyOpenGLView.m
Comment thread ShellScripts/Linux/install_packages_root.sh Outdated
@mcarans

mcarans commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

Yes it's odd. I have fixed the release so now it's easy to see the versions in the filenames: https://github.com/OoliteProject/oolite/releases/tag/1.93.1-localSemver.11. AppImage is correct which suggests the logic in get_version.sh is ok, but the rest have dirty which is odd. Something must change in the repo during the build for Windows and flatpak only.

flatpak now seems to miss version which I thought I'd already fixed.

@mcarans

mcarans commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

https://github.com/OoliteProject/oolite/releases/tag/1.93.1-localSemver.12 flatpak is now correct (again). Windows still left.

@mcarans mcarans dismissed their stale review June 23, 2026 00:14

My review is outdated

mcarans
mcarans previously approved these changes Jun 23, 2026

@mcarans mcarans left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks better now. It was a Windows line ending issue with git. https://github.com/OoliteProject/oolite/releases/tag/1.93.1-localSemver.15

@phkb

phkb commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

Is this something to be concerned about?

$ make release
meson setup build/meson_release -Ddebug=false -Dstrip_bin=true -Db_lto=true -Dgithub_repository= --native-file clang.ini --reconfigure 2>/dev/null || meson setup build/meson_release -Ddebug=false -Dstrip_bin=true -Db_lto=true -Dgithub_repository= --native-file clang.ini

ERROR: Unknown option: "github_repository".
Directory already configured.

Just run your build command (e.g. ninja) and Meson will regenerate as necessary.
Run "meson setup --reconfigure" to force Meson to regenerate.

If build failures persist, run "meson setup --wipe" to rebuild from scratch
using the same options as passed when configuring the build.

@mcarans

mcarans commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

Is this something to be concerned about?

$ make release
meson setup build/meson_release -Ddebug=false -Dstrip_bin=true -Db_lto=true -Dgithub_repository= --native-file clang.ini --reconfigure 2>/dev/null || meson setup build/meson_release -Ddebug=false -Dstrip_bin=true -Db_lto=true -Dgithub_repository= --native-file clang.ini

ERROR: Unknown option: "github_repository".
Directory already configured.

Just run your build command (e.g. ninja) and Meson will regenerate as necessary.
Run "meson setup --reconfigure" to force Meson to regenerate.

If build failures persist, run "meson setup --wipe" to rebuild from scratch
using the same options as passed when configuring the build.

I'm guessing meson is caching something from an old build from the message "Directory already configured." Try running make clean. The github_repository option is defined:
https://github.com/OoliteProject/oolite/blob/localSemver/meson.options#L48-L49

@phkb

phkb commented Jun 23, 2026

Copy link
Copy Markdown
Contributor
image

I'm getting "Oolite v by unknown" as the title on the Oolite window.

@mcarans

mcarans commented Jun 23, 2026

Copy link
Copy Markdown
Contributor
image

I'm getting "Oolite v by unknown" as the title on the Oolite window.

The unknown is ok - only CI build of OoliteProject repo will show OoliteProject with everything else showing unknown as per oocube's design to distinguish official builds from all else.

Do you have gitversion installed? ShellScripts/Windows/install_deps.sh installs it.

Remove unneeded OOLITE_VERSION.txt
Make error messages consistent
@mcarans

mcarans commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

I just added a check for gitversion's existence in gitversion.sh.

@phkb

phkb commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

OK, I ran the install_deps.sh script, and now I get this:

image

Which I assume is what we want, correct?

@mcarans

mcarans commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

OK, I ran the install_deps.sh script, and now I get this:
image

Which I assume is what we want, correct?

Yes that's right.

@phkb phkb left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Tested all the NSIS installers, everything looks fine to me.

@mcarans mcarans merged commit 36c77f0 into master Jun 23, 2026
24 checks passed
@oocube oocube deleted the localSemver branch June 23, 2026 18:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

linux packageinfo version is inconsistent with git tags

3 participants