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 to Agda 2.6.4 #814

Merged
merged 22 commits into from
Nov 25, 2023
Merged

Update to Agda 2.6.4 #814

merged 22 commits into from
Nov 25, 2023

Conversation

fredrik-bakke
Copy link
Collaborator

@fredrik-bakke fredrik-bakke commented Oct 7, 2023

Bumps the Agda version to 2.6.4 and sets the --level-universe flag.

@fredrik-bakke
Copy link
Collaborator Author

It seems the new version is not yet available from the required resources, so this PR will have to sit in the meantime.

@EgbertRijke
Copy link
Collaborator

It seems the new version is not yet available from the required resources, so this PR will have to sit in the meantime.

I was just gonna say, it is not on brew yet

@fredrik-bakke
Copy link
Collaborator Author

fredrik-bakke commented Oct 7, 2023

A thought: with the new --no-allow-unsolved-metas flag, I wonder if we can streamline the formalization process by assuming --allow-unsolved-metas by default, but setting --no-allow-unsolved-metas in everything.lagda.md. This way, I assume* the code will not typecheck with make check, but you don't have to write in {-# OPTION --allow-unsolved-metas #-} while formalizing. This also makes the cleanup process easier.

@fredrik-bakke
Copy link
Collaborator Author

fredrik-bakke commented Oct 7, 2023

If you're as eager as me, you can download the cask for 2.6.4 here and try* install from your local file using

brew install --build-from-source agda.rb

@fredrik-bakke
Copy link
Collaborator Author

fredrik-bakke commented Oct 7, 2023

Also, before this is merged, the flake.nix file needs to be updated somehow. Currently, it contains the following comment

    # Unstable is needed for Agda 2.6.3, latest stable 22.11 only has 2.6.2.2

However, I don't see how to update the file to use 2.6.4

@VojtechStep
Copy link
Collaborator

Also, before this is merged, the flake.nix file needs to be updated somehow. Currently, it contains the following comment

    # Unstable is needed for Agda 2.6.3, latest stable 22.11 only has 2.6.2.2

However, I don't see how to update the file to use 2.6.4

The file that needs updating is flake.lock; that tracks which version of the nixpkgs package collection we're using, and it's updated with nix flake update. However the latest package set still doesn't have Agda 2.6.4, see https://search.nixos.org/packages?channel=unstable&show=agda, and there isn't yet a PR updating it.

@EgbertRijke
Copy link
Collaborator

If you're as eager as me, you can download the cask for 2.6.4 here and try* install from your local file using

brew install --build-from-source agda.rb

I'm not that adventurous with my agda-installation:) I've installed it with brew, and it updates whenever updates come through brew. I found that this setup works much better for me than if I fiddle with the installation myself. So I'll wait patiently until it is on brew:)

@fredrik-bakke fredrik-bakke changed the title Agda 2.6.4 Update to Agda 2.6.4 Oct 16, 2023
Copy link
Collaborator Author

@fredrik-bakke fredrik-bakke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Enabling the --level-universe flag will require some more deliberation before it can be implemented.

Makefile Outdated Show resolved Hide resolved
agda-unimath.agda-lib Outdated Show resolved Hide resolved
scripts/demote_foundation_imports.py Outdated Show resolved Hide resolved
scripts/remove_unused_imports.py Outdated Show resolved Hide resolved
DESIGN-PRINCIPLES.md Outdated Show resolved Hide resolved
@EgbertRijke
Copy link
Collaborator

It looks like there are other occurrences of '2.6.3', because when I did a global search-replace it found 11 instances.

@fredrik-bakke
Copy link
Collaborator Author

Thanks! I'll look into it

@EgbertRijke
Copy link
Collaborator

EgbertRijke commented Oct 18, 2023

I'm also quite puzzled why agda 2.6.4 is still unknown to our CI. Did we set up something incorrectly, or is it really taking this long for the new release version to be recognized?

@fredrik-bakke
Copy link
Collaborator Author

Maybe I set up something wrong in this PR. This would make sense given the discrepancy you previously pointed out.

@fredrik-bakke
Copy link
Collaborator Author

Give me a little bit of time and I can investigate it

@fredrik-bakke
Copy link
Collaborator Author

Still seems like 2.6.4 isn't available for the CI tooling. I don't know much beyond that though. Also, Agda 2.6.4 is not available for Nix either, and I think we should wait to merge this PR until it is.

@EgbertRijke
Copy link
Collaborator

I agree with you, it doesn't make much sense to merge this PR until 264 is available for the CI.

@VojtechStep
Copy link
Collaborator

@fredrik-bakke if you bump the wenkokke/setup-agda GitHub action in all the CI files from v2.0.0 to v2.1.0 then it should recognize Agda 2.6.4. Also we should get 2.6.4 in nixpkgs any day now, the PR was merged yesterday (branch progress tracker). Though we might still want to wait a little bit with this one, since @maybemabeline apparently uses Arch and that's still on 2.6.3.

@VojtechStep
Copy link
Collaborator

Nix already has 2.6.4 (though it doesn't show on the website, not sure why)

@fredrik-bakke
Copy link
Collaborator Author

Oh. Well then. That leaves the Arch situation, how can we track that?

@fredrik-bakke
Copy link
Collaborator Author

By the way, do you know if the two "required checks" for 2.6.3 will update when the branch is merged?

DESIGN-PRINCIPLES.md Outdated Show resolved Hide resolved
@fredrik-bakke fredrik-bakke marked this pull request as ready for review November 14, 2023 09:50
@VojtechStep
Copy link
Collaborator

Oh. Well then. That leaves the Arch situation, how can we track that?

We can keep checking the pacman page, or we can ask @maybemabeline to ping us once she gets the update.

By the way, do you know if the two "required checks" for 2.6.3 will update when the branch is merged?

I'd think so - usually the "expected" checks are taken from the master/target branch, so that you don't accidentally/maliciously remove previously required checks; so once this PR gets merged, the default expected check would change from {macOS,ubuntu}-2.6.3 to {macOS,ubuntu}-2.6.4.

@fredrik-bakke
Copy link
Collaborator Author

Good point, thanks!

@VojtechStep
Copy link
Collaborator

Oh and just because Agda 2.6.4 is available from nixpkgs doesn't mean that we're pulling it, we need to update the flake.lock file as well; I think it'd be easiest if I made a PR to your branch, I should have some time in the afternoon.

I kept the mdbook crates on the same version by pinning the checkout
of nixpkgs we were using previously as `nixpkgs-mdbook`
@VojtechStep
Copy link
Collaborator

fredrik-bakke#3

@VojtechStep
Copy link
Collaborator

As mentioned on Discord, Agda 2.6.4 is available on Arch, so there should be nothing blocking this PR any longer.

@VojtechStep
Copy link
Collaborator

I'd think so - usually the "expected" checks are taken from the master/target branch, so that you don't accidentally/maliciously remove previously required checks; so once this PR gets merged, the default expected check would change from {macOS,ubuntu}-2.6.3 to {macOS,ubuntu}-2.6.4.

I think this is wrong, actually - apparently "required checks" isn't an automatic thing, it's a branch protection rule that can be configured via the GitHub UI in repository settings (Settings > Branches > edit protection rule "Require status checks to pass before merging"), but I don't have rights to access that part of the repository settings.

@fredrik-bakke
Copy link
Collaborator Author

Me neither. We will have to wait until @EgbertRijke sees this.

@EgbertRijke EgbertRijke enabled auto-merge (squash) November 25, 2023 17:29
@EgbertRijke EgbertRijke merged commit cd1eb1a into UniMath:master Nov 25, 2023
3 checks passed
fredrik-bakke added a commit to fredrik-bakke/agda-unimath that referenced this pull request Nov 26, 2023
Co-authored-by: Egbert Rijke <[email protected]>
Co-authored-by: VojtechStep <[email protected]>
fredrik-bakke added a commit to fredrik-bakke/agda-unimath that referenced this pull request Nov 29, 2023
Co-authored-by: Egbert Rijke <[email protected]>
Co-authored-by: VojtechStep <[email protected]>
@fredrik-bakke fredrik-bakke deleted the agda-v2.6.4 branch February 7, 2024 11:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants