Unverified Commit eb394bfc authored by Marius Kleidl's avatar Marius Kleidl Committed by GitHub
Browse files

tusd: embed version in binary (#409019) 

* nixosTests.tusd: Fix network race condition

Fixes error:

    client # curl: (7) Failed to connect to server port 1080 after 8 ms: Could not connect to server
    client # [    5.621267] network-addresses-eth1-start[795]: adding address 192.168.1.1/24... done

* tusd: embed version in binary

Currently, tusd reports 'n/a' when its version is queried using `tusd -version`.
This change embeds the current version during the build process, so it correctly
reports the value.

See https://github.com/tus/tusd/blob/8e66333a019e500eb1c5a0b9843342606382ef5e/scripts/build_funcs.sh#L20



---------

Co-authored-by: default avatarNiklas Hambüchen <mail@nh2.me>
parent 7cbb56ff

nixos/tests/tusd/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ in 
    client.succeed("${pkgs.coreutils}/bin/truncate --size=100M file-100M.bin")



    # Upload it.

    client.wait_for_unit("network.target")

    client.succeed("${./tus-curl-upload.sh} file-100M.bin http://server:${toString port}/files/")



    print("Upload succeeded")

pkgs/by-name/tu/tusd/package.nix

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ buildGoModule rec { 


  vendorHash = "sha256-YununGyB72zE0tmqO3BREJeMTjCuy/1fhPHC5r8OLjg=";



  ldflags = [

    "-X github.com/tus/tusd/v2/cmd/tusd/cli.VersionName=v${version}"

  ];



  # Tests need the path to the binary:

  # https://github.com/tus/tusd/blob/0e52ad650abed02ec961353bb0c3c8bc36650d2c/internal/e2e/e2e_test.go#L37

  preCheck = ''