Skip to content

Commit

Permalink
ci(flake): disable cargo check in nix flake
Browse files Browse the repository at this point in the history
Left as a separate commit, so it is easy to revert.

Signed-off-by: Harald Hoyer <[email protected]>
  • Loading branch information
haraldh committed Mar 27, 2024
1 parent a2c248a commit 1a784f4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@v4
- uses: DeterminateSystems/magic-nix-cache-action@main

- name: nix build
run: nix run nixpkgs#nixci -- -- --impure

Expand Down
41 changes: 4 additions & 37 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -71,41 +71,6 @@
NIX_OUTPATH_USED_AS_RANDOM_SEED = "aaaaaaaaaa";
};

cargoTestExtraArgs = pkgs.lib.strings.concatStringsSep " " [
"--"
# Depend on creating an HTTP client and that reads from the systems truststore
# Because nix is fully isolated, these types of tests fail
#
# Some (most?) of these also depend on the network? Not good??
"--skip=activitypub::fetcher::test::federation_allow"
"--skip=activitypub::fetcher::test::federation_deny"
"--skip=activitypub::fetcher::test::fetch_actor"
"--skip=activitypub::fetcher::test::fetch_note"
"--skip=resolve::post::test::parse_mentions"
"--skip=webfinger::test::fetch_qarnax_ap_id"
"--skip=basic_request"
"--skip=json_request"
"--skip=http::handler::well_known::webfinger::tests::basic"
"--skip=http::handler::well_known::webfinger::tests::custom_domain"
"--skip=test::default_resolver_works"
"--skip=fetcher::basic::fetch_actor"
"--skip=fetcher::basic::fetch_emoji"
"--skip=fetcher::basic::fetch_note"
"--skip=fetcher::filter::federation_allow"
"--skip=fetcher::filter::federation_deny"
"--skip=fetcher::infinite::fetch_infinitely_long_reply_chain"
"--skip=fetcher::origin::check_ap_content_type"
"--skip=fetcher::origin::check_ap_id_authority"
"--skip=fetcher::webfinger::fetch_actor_with_custom_acct"
"--skip=fetcher::webfinger::ignore_fake_webfinger_acct"
"--skip=accounts_username"
"--skip=users_username"
"--skip=test::abort_request_works"
"--skip=test::full_test"
"--skip=attachment::test::upload_jpeg"
"--skip=post::resolver::test::parse_post"
];

cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
version = cargoToml.workspace.package.version;

Expand All @@ -123,13 +88,15 @@
cli = craneLib.buildPackage (commonArgs // rec {
pname = "kitsune-cli";
cargoExtraArgs = "--locked ${features} -p kitsune-cli ";
inherit cargoArtifacts cargoTestExtraArgs;
inherit cargoArtifacts;
doCheck = false;
});

main = craneLib.buildPackage (commonArgs // rec {
pname = "kitsune";
cargoExtraArgs = "--locked ${features} -p kitsune";
inherit cargoArtifacts cargoTestExtraArgs;
inherit cargoArtifacts;
doCheck = false;
});

frontend = pkgs.mkYarnPackage {
Expand Down

0 comments on commit 1a784f4

Please sign in to comment.