Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update flake inputs #2058

Merged
merged 1 commit into from
Oct 2, 2024
Merged

Update flake inputs #2058

merged 1 commit into from
Oct 2, 2024

Conversation

yannham
Copy link
Member

@yannham yannham commented Oct 1, 2024

Update various flake inputs and the flake.lock file. Adapt the flake.nix file, as well as the Rust source code, to accomodate the latest changes (new clippy warnings, etc.).

This PR has been split off #2037, which started to mix too many concerns. The pure workflow changes are left in #2037.

Topiary is getting hard to use from the flake, because there are two conflicting versions: the one that is pulled from the flake's input to be used in the CI (checking that files are properly formatted), and the one built into Nickel via cargo. Both must agree (or at least there might be a difference in formatting between the two if they aren't the same version). Since the addition of dynamic loading of grammars, the flake input's Topiary has become harder to build from Nix, and is also failing the CI even if we don't update it because of tweag/topiary#702.

To avoid all those pitfalls, this commit gets rid of the Topiary as a flake input, and use nickel format instead, ensuring that the formatting is consistent. As a consequence, Topiary isn't included in the development shell anymore, but it's arguably not an issue: it was included before nickel format, as we needed a third party formatter, but now one can just build Nickel locally with one's preferred method and use nickel format.

@yannham yannham requested a review from jneem October 1, 2024 08:29
@github-actions github-actions bot temporarily deployed to pull request October 1, 2024 08:32 Inactive
@github-actions github-actions bot temporarily deployed to pull request October 1, 2024 09:50 Inactive
@github-actions github-actions bot temporarily deployed to pull request October 1, 2024 10:02 Inactive
@github-actions github-actions bot temporarily deployed to pull request October 1, 2024 16:45 Inactive
Copy link
Contributor

github-actions bot commented Oct 1, 2024

🐰 Bencher Report

Branch2058/merge
Testbedubuntu-latest

⚠️ WARNING: The following Measure does not have a Threshold. Without a Threshold, no Alerts will ever be generated!

Click here to create a new Threshold
For more information, see the Threshold documentation.
To only post results if a Threshold exists, set the --ci-only-thresholds CLI flag.

Click to view all benchmark results
BenchmarkLatencynanoseconds (ns)
fibonacci 10📈 view plot
⚠️ NO THRESHOLD
496,540.00
pidigits 100📈 view plot
⚠️ NO THRESHOLD
3,272,800.00
product 30📈 view plot
⚠️ NO THRESHOLD
841,660.00
scalar 10📈 view plot
⚠️ NO THRESHOLD
1,546,800.00
sum 30📈 view plot
⚠️ NO THRESHOLD
839,910.00
🐰 View full continuous benchmarking report in Bencher

Update various flake inputs and the flake.lock file. Adapt the flake.nix
file, as well as the Rust source code, to accomodate the latest changes
(new clippy warnings, etc.).

Topiary is getting hard to use from the flake, because there are two
conflicting versions: the one that is pulled from Nix to be used in the
CI (checking that files are properly formatted), and the one built into
Nickel via cargo. Both must agree (or at least there might be a
difference in formatting between the two if they aren't the same
version). Since the addition of dynamic loading of grammars, latest
Topiary has become harder to build from Nix.

To avoid all those pitfalls, this commit gets rid of the Topiary as a
flake input, and use `nickel format` instead, ensuring that the
formatting is consistent. As a consequence, Topiary isn't included in
the development shell anymore, but it's arguably not an issue: it was
included before `nickel format`, as we needed a third party formatter,
but now one can just build Nickel locally with their preferred method
and use `nickel format`.
@github-actions github-actions bot temporarily deployed to pull request October 2, 2024 08:23 Inactive
@yannham yannham added this pull request to the merge queue Oct 2, 2024
Merged via the queue into master with commit 927ee23 Oct 2, 2024
8 checks passed
@yannham yannham deleted the update/flake-lock branch October 2, 2024 09:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants