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

Merge 8.16, 8.17 and 8.18 into main #993

Merged
merged 75 commits into from
Oct 16, 2023
Merged

Merge 8.16, 8.17 and 8.18 into main #993

merged 75 commits into from
Oct 16, 2023

Conversation

yforster
Copy link
Member

No description provided.

JasonGross and others added 30 commits April 23, 2023 12:33
This is useful for managing global envs around Gallina quotation.
This will allow programatically combining checker flags from multiple
constants in Gallina quotation.
This will be useful for proving that quotation of byte is well-typed
with the safechecker.
Add MCListable class for enumerating finite types
Close computational obligations with defined in erase_global_decls
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 20 to 21.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](cachix/install-nix-action@v20...v21)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Add a merge operation for the global env
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 21 to 22.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](cachix/install-nix-action@v21...v22)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 21 to 22.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](cachix/install-nix-action@v21...v22)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
improve strengthening to get cumul info on type
@yforster yforster changed the title Main updates 8.18 Merge 8.16, 8.17 and 8.18 into main Oct 16, 2023
@yforster yforster merged commit adc980c into main Oct 16, 2023
11 of 12 checks passed
@yforster yforster deleted the main-updates-8.18 branch October 16, 2023 15:11

+ intros hl.
case: (knset_mem_spec kn0 _) => hin.
* elimtype False.
Copy link
Contributor

Choose a reason for hiding this comment

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

elimtype doesn't exist anymore

@SkySkimmer
Copy link
Contributor

This broke Coq master

@@ -1,5 +1,5 @@
opam-version: "2.0"
version: "dev"
version: "8.18.dev"
Copy link
Contributor

Choose a reason for hiding this comment

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

This seems backwards

@@ -1,5 +1,5 @@
opam-version: "2.0"
version: "dev"
version: "8.18.dev"
Copy link
Contributor

Choose a reason for hiding this comment

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

And this

@@ -1,5 +1,5 @@
opam-version: "2.0"
version: "dev"
version: "8.18.dev"
Copy link
Contributor

Choose a reason for hiding this comment

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

And this

@@ -1,5 +1,5 @@
opam-version: "2.0"
version: "dev"
version: "8.18.dev"
Copy link
Contributor

Choose a reason for hiding this comment

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

This too

@@ -1,5 +1,5 @@
opam-version: "2.0"
version: "dev"
version: "8.18.dev"
Copy link
Contributor

Choose a reason for hiding this comment

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

And this

@@ -1,5 +1,5 @@
opam-version: "2.0"
version: "dev"
version: "8.18.dev"
Copy link
Contributor

Choose a reason for hiding this comment

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

And this

"coq" { = "dev" }
"coq-equations" { = "dev" }
"coq" { >= "8.18" & < "8.19~" }
"coq-equations" { = "1.3+8.18" }
Copy link
Contributor

Choose a reason for hiding this comment

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

This change is breaking CI, as is the line above it

@@ -1,5 +1,5 @@
opam-version: "2.0"
version: "dev"
version: "8.18.dev"
Copy link
Contributor

Choose a reason for hiding this comment

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

This too

@@ -19,7 +19,11 @@ jobs:
fetch-depth: 0
ref: ${{ env.tested_commit }}
- name: Cachix install
<<<<<<<< HEAD:.github/workflows/nix-action-coq-dev-macos.yml
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this a merge artifact?

@@ -19,7 +19,11 @@ jobs:
fetch-depth: 0
ref: ${{ env.tested_commit }}
- name: Cachix install
<<<<<<<< HEAD:.github/workflows/nix-action-coq-dev-ubuntu.yml
Copy link
Contributor

Choose a reason for hiding this comment

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

And this too

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.

6 participants