about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorAdam C. Stephens <2071575+adamcstephens@users.noreply.github.com>2024-04-26 15:56:44 -0400
committerGitHub <noreply@github.com>2024-04-26 15:56:44 -0400
commitf667250b4d82a482968c6fd9f3d824d33c51fa99 (patch)
tree5ef8618594ca088e47fd313846c36a667799d823 /nixos
parent81409c711e64a1d7d9ab3f2c2a47d8f32131a3c7 (diff)
parent6c359d6488660331e53eb7203b22be2551a92b30 (diff)
Merge pull request #306341 from adamcstephens/forgejo/7
forgejo: 1.21.11-1 -> 7.0.0
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/forgejo.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/tests/forgejo.nix b/nixos/tests/forgejo.nix
index 8b9ee46ff5d32..827fae2790c6e 100644
--- a/nixos/tests/forgejo.nix
+++ b/nixos/tests/forgejo.nix
@@ -141,9 +141,9 @@ 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, (
+        assert "development" != api_version and "${pkgs.forgejo.version}+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."
+            + f"but should contain a forgejo+gitea compatibility version string. Got '{api_version}' instead."
         )
 
         server.succeed(
@@ -152,7 +152,7 @@ let
         )
         server.succeed(
             "su -l forgejo -c 'GITEA_WORK_DIR=/var/lib/forgejo gitea admin user create "
-            + "--username test --password totallysafe --email test@localhost'"
+            + "--username test --password totallysafe --email test@localhost --must-change-password=false'"
         )
 
         api_token = server.succeed(