Unverified Commit 053ab7f5 authored by Emily's avatar Emily Committed by GitHub
Browse files

Merge pull request #300981 from emilylange/forgejo-ldflags 

forgejo: add missing internal version ldflags, nixosTests.forgejo: test /api/forgejo/v1/version
parents 436699df 680bc077

nixos/tests/forgejo.nix

+6 −0
Original line number Diff line number Diff line
@@ -108,6 +108,12 @@ let 


        assert "BEGIN PGP PUBLIC KEY BLOCK" in server.succeed("curl http://localhost:3000/api/v1/signing-key.gpg")



        api_version = json.loads(server.succeed("curl http://localhost:3000/api/forgejo/v1/version")).get("version")

        assert "development" != api_version and "-gitea-" in api_version, (

            "/api/forgejo/v1/version should not return 'development' "

            + f"but should contain a gitea compatibility version string. Got '{api_version}' instead."

        )



        server.succeed(

            "curl --fail http://localhost:3000/user/sign_up | grep 'Registration is disabled. "

            + "Please contact your site administrator.'"

pkgs/applications/version-management/forgejo/default.nix

+21 −1
Original line number Diff line number Diff line
@@ -46,7 +46,23 @@ buildGoModule rec { 
    owner = "forgejo";

    repo = "forgejo";

    rev = "v${version}";

    hash = "sha256-nufhGsibpPrGWpVg75Z6qdzlc1K+p36mMjlS2MtsuAI=";

    hash = "sha256-eIxITMvb1q4L2lejbmuPPQ8XG5YYjTo+9RosPEJgZ3g=";

    # Forgejo has multiple different version strings that need to be provided

    # via ldflags.  main.ForgejoVersion for example is a combination of a

    # hardcoded gitea compatibility version string (in the Makefile) and

    # git describe and is easiest to get by invoking the Makefile.

    # So we do that, store it the src FOD to then extend the ldflags array

    # in preConfigure.

    # The `echo -e >> Makefile` is temporary and already part of the next

    # major release.  Furthermore, the ldflags will change next major release

    # and need to be updated accordingly.

    leaveDotGit = true;

    postFetch = ''

      cd "$out"

      echo -e 'show-version-full:\n\t@echo ''${FORGEJO_VERSION}' >> Makefile

      make show-version-full > FULL_VERSION

      find "$out" -name .git -print0 | xargs -0 rm -rf

    '';

  };



  vendorHash = "sha256-+1apPnqbIfp2Nu1ieI2DdHo4gndZObmcq/Td+ZtkILM=";
@@ -76,6 +92,10 @@ buildGoModule rec { 
    "-X 'main.Tags=${lib.concatStringsSep " " tags}'"

  ];



  preConfigure = ''

    export ldflags+=" -X code.gitea.io/gitea/routers/api/forgejo/v1.ForgejoVersion=$(cat FULL_VERSION) -X main.ForgejoVersion=$(cat FULL_VERSION)"

  '';



  preBuild = ''

    go run build/merge-forgejo-locales.go

  '';