Unverified Commit 169adc0d authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

forgejo: rename bin/gitea -> bin/forgejo (#446031)

parents c8fa28cc 513349d0

doc/release-notes/rl-2511.section.md

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ 


- `hiawata` has been removed, due to lack of active development upstream, lack of maintainership downstream and upcoming security issues.



- `forgejo` main program has been renamed to `bin/forgejo` from the previous `bin/gitea`.



- `cudaPackages.cudatoolkit-legacy-runfile` has been removed.



- `conduwuit` was removed due to upstream ceasing development and deleting their repository. For existing data, a migration to `matrix-conduit`, `matrix-continuwuity` or `matrix-tuwunel` may be possible.

nixos/tests/forgejo.nix

+2 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ let 
              + "Please contact your site administrator.'"

          )

          server.succeed(

              "su -l forgejo -c 'GITEA_WORK_DIR=/var/lib/forgejo gitea admin user create "

              "su -l forgejo -c 'GITEA_WORK_DIR=/var/lib/forgejo forgejo admin user create "

              + "--username test --password totallysafe --email test@localhost --must-change-password=false'"

          )
@@ -223,7 +223,7 @@ let 


          with subtest("Testing runner registration and action workflow"):

              server.succeed(

                  "su -l forgejo -c 'GITEA_WORK_DIR=/var/lib/forgejo gitea actions generate-runner-token' | sed 's/^/TOKEN=/' | tee /var/lib/forgejo/runner_token"

                  "su -l forgejo -c 'GITEA_WORK_DIR=/var/lib/forgejo forgejo actions generate-runner-token' | sed 's/^/TOKEN=/' | tee /var/lib/forgejo/runner_token"

              )

              server.succeed("${serverSystem}/specialisation/runner/bin/switch-to-configuration test")

              server.wait_for_unit("gitea-runner-test.service")

pkgs/by-name/fo/forgejo/generic.nix

+3 −3
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ buildGoModule rec { 
    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];



  preInstall = ''

    mv "$GOPATH/bin/forgejo.org" "$GOPATH/bin/gitea"

    mv "$GOPATH/bin/forgejo.org" "$GOPATH/bin/forgejo"

  '';



  postInstall = ''
@@ -137,7 +137,7 @@ buildGoModule rec { 
    cp -R ./{templates,options} ${frontend}/public $data

    mkdir -p $out

    cp -R ./options/locale $out/locale

    wrapProgram $out/bin/gitea \

    wrapProgram $out/bin/forgejo \

      --prefix PATH : ${

        lib.makeBinPath [

          bash
@@ -202,6 +202,6 @@ buildGoModule rec { 
      tebriel

    ];

    broken = stdenv.hostPlatform.isDarwin;

    mainProgram = "gitea";

    mainProgram = "forgejo";

  };

}