Update Nix flake to run e2e tests

This fixes the e2e testing in the Nix flake. It also requires locking the SHA of
`radicle` since it is a Git dependency in the `Cargo.toml`.

Running the update also automatically applied a change to change `reply_to` to
`replyTo` in `Action.ts`.
This commit is contained in:
Fintan Halpenny
2025-02-24 11:01:40 +01:00
committed by Sebastian Martinez
parent 6ca5f29622
commit 0efb4e09f7
5 changed files with 36 additions and 22 deletions
+1
View File
@@ -0,0 +1 @@
use flake
Generated
+6 -6
View File
@@ -167,11 +167,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1738702386,
"narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=",
"lastModified": 1739923778,
"narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e",
"rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1",
"type": "github"
},
"original": {
@@ -218,11 +218,11 @@
]
},
"locked": {
"lastModified": 1738808867,
"narHash": "sha256-m5rbY/ck0NAlfSBxo++vl7EZn8fkZ02H3kGGc7q883c=",
"lastModified": 1740018520,
"narHash": "sha256-mU6H0Q1WPn0XuwBO9SLZb/1yeVMfvsifBJcXNlhB+Ts=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "ae46f37fb727030ddc2ef65a675b751484c90032",
"rev": "7f6ecf3b7c5bfcc4730943a767630122efd09dc8",
"type": "github"
},
"original": {
+13 -3
View File
@@ -76,6 +76,7 @@
openssl,
webkitgtk_4_1,
git,
openssh,
playwright-browsers_v1_47_0,
}: let
rTc = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain;
@@ -89,12 +90,17 @@
src = ./.;
cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"radicle-0.14.0" = "sha256-F7pJ+yLhlRXg03A+pNXwsqNSOG3qJs6bEO9YUUXs4f0=";
};
};
npmDeps = fetchNpmDeps {
name = pname + "-npm-deps-" + version;
inherit src;
hash = "sha256-CnuO8aVA87s1E03Uj8tSFDiiA7dO5m2Ww7E6C78fpkI="; # npmDepsHash : Update canary, don't touch!
hash = "sha256-11qBh/Lr10X5sFgM6FJOFqQYnAsnC+avkbXdABYOtTE="; # npmDepsHash : Update canary, don't touch!
};
nativeBuildInputs = [
@@ -117,7 +123,7 @@
'';
doCheck = false;
nativeCheckInputs = [ git ];
nativeCheckInputs = [ git openssh ];
env = {
HW_RELEASE = "nix-" + (heartwood.shortRev or "unknown-ref");
@@ -128,6 +134,9 @@
};
preCheck = ''
export RAD_HOME="$PWD/_rad-home"
export RAD_PASSPHRASE=""
rad auth --alias test
bins="tests/tmp/bin/heartwood/$HW_RELEASE"
mkdir -p "$bins"
cp -t "$bins" -- ${heartwood.packages.${system}.radicle}/bin/*
@@ -135,6 +144,7 @@
'';
checkPhase = ''
npm run build:http
npm run test:unit
scripts/check-js
scripts/check-rs
+15 -12
View File
@@ -19,7 +19,7 @@
},
"devDependencies": {
"@eslint/js": "^9.17.0",
"@playwright/test": "^1.49.1",
"@playwright/test": "=1.47.0",
"@radicle/gray-matter": "4.1.0",
"@sveltejs/vite-plugin-svelte": "^5.0.2",
"@tauri-apps/cli": "^2.1.0",
@@ -740,12 +740,13 @@
}
},
"node_modules/@playwright/test": {
"version": "1.49.1",
"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.49.1.tgz",
"integrity": "sha512-Ky+BVzPz8pL6PQxHqNRW1k3mIyv933LML7HktS8uik0bUXNCdPhoS/kLihiO1tMf/egaJb4IutXd7UywvXEW+g==",
"version": "1.47.0",
"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.47.0.tgz",
"integrity": "sha512-SgAdlSwYVpToI4e/IH19IHHWvoijAYH5hu2MWSXptRypLSnzj51PcGD+rsOXFayde4P9ZLi+loXVwArg6IUkCA==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
"playwright": "1.49.1"
"playwright": "1.47.0"
},
"bin": {
"playwright": "cli.js"
@@ -3513,12 +3514,13 @@
}
},
"node_modules/playwright": {
"version": "1.49.1",
"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.49.1.tgz",
"integrity": "sha512-VYL8zLoNTBxVOrJBbDuRgDWa3i+mfQgDTrL8Ah9QXZ7ax4Dsj0MSq5bYgytRnDVVe+njoKnfsYkH3HzqVj5UZA==",
"version": "1.47.0",
"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.47.0.tgz",
"integrity": "sha512-jOWiRq2pdNAX/mwLiwFYnPHpEZ4rM+fRSQpRHwEwZlP2PUANvL3+aJOF/bvISMhFD30rqMxUB4RJx9aQbfh4Ww==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
"playwright-core": "1.49.1"
"playwright-core": "1.47.0"
},
"bin": {
"playwright": "cli.js"
@@ -3531,10 +3533,11 @@
}
},
"node_modules/playwright-core": {
"version": "1.49.1",
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.49.1.tgz",
"integrity": "sha512-BzmpVcs4kE2CH15rWfzpjzVGhWERJfmnXmniSyKeRZUs9Ws65m+RGIi7mjJK/euCegfn3i7jvqWeWyHe9y3Vgg==",
"version": "1.47.0",
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.47.0.tgz",
"integrity": "sha512-1DyHT8OqkcfCkYUD9zzUTfg7EfTd+6a8MkD/NWOvjo0u/SCNd5YmY/lJwFvUZOxJbWNds+ei7ic2+R/cRz/PDg==",
"dev": true,
"license": "Apache-2.0",
"bin": {
"playwright-core": "cli.js"
},
+1 -1
View File
@@ -34,7 +34,7 @@
},
"devDependencies": {
"@eslint/js": "^9.17.0",
"@playwright/test": "^1.49.1",
"@playwright/test": "=1.47.0",
"@radicle/gray-matter": "4.1.0",
"@sveltejs/vite-plugin-svelte": "^5.0.2",
"@tauri-apps/cli": "^2.1.0",