Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

forgejo: add missing internal version ldflags, nixosTests.forgejo: test /api/forgejo/v1/version #300981

Merged
merged 2 commits into from
Apr 4, 2024

Conversation

emilylange
Copy link
Member

Description of changes

PR is a bug fix in our nixpkgs packaging, prepares us for the next major release and adds a version test.


Those two ldlfags provide the version string for the /api/forgejo/v1/version API endpoint and the forgejo_sem_ver database table.

Prio to this change, /api/forgejo/v1/version returned "development" and the database table "1.0.0".

The proper version string, which we are now providing, is a combination of a hardcoded version compatibility string (like "gitea-1.21.8") and the forgejo semver version.

The forgejo semver version in forgejo v1.21.8-0 is technically hardcoded in the Makefile, but will use git describe starting with the next major release (which will also be the release when forgejo makes this semver user facing).

So in summary, this commit is a bug fix in our nixpkgs packaging and prepares us for the next major release.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Those two ldlfags provide the version string for the
/api/forgejo/v1/version API endpoint and the forgejo_sem_ver database
table.

Prio to this change, /api/forgejo/v1/version returned "development" and
the database table "1.0.0".

The proper version string, which we are now providing, is a combination
of a hardcoded version compatibility string (like "gitea-1.21.8") and
the forgejo semver version.

The forgejo semver version in forgejo v1.21.8-0 is technically hardcoded
in the Makefile, but will use git describe starting with the next major
release (which will also be the release when forgejo makes this semver
user facing).

So in summary, this commit is a bug fix in our nixpkgs packaging and
prepares us for the next major release.
We forgot to set two version related ldflags in our packaging and this
should prevent this from going unnoticed again.

Further details are in dab7aa2.
@emilylange
Copy link
Member Author

Self-merging this, since it has an approval from a maintainer and forgejo v1.21.10-0 has just been released.

@emilylange emilylange merged commit 053ab7f into NixOS:master Apr 4, 2024
32 checks passed
@emilylange emilylange deleted the forgejo-ldflags branch April 4, 2024 19:31
@emilylange emilylange mentioned this pull request Apr 24, 2024
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants