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.

Sign up for GitHub

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 into 8.17 #992

Merged
merged 23 commits into from
Oct 16, 2023
Merged

Merge 8.16 into 8.17 #992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
46454e2
Fix monad_map_branches_k name (#953)
JasonGross Apr 23, 2023
d8f1479
Add boolean versions of the varieties of `extends` (#954)
JasonGross Apr 23, 2023
dd8c80d
Add a merge operation for the global env
JasonGross Apr 21, 2023
7ea63fa
Add computable version of Env compatibility; refactor extension a bit
JasonGross Apr 21, 2023
6ddfd13
More extension lemmas
JasonGross Apr 24, 2023
6307467
Fix issue with hint breaking a proof
JasonGross Apr 24, 2023
6c63eac
Add union and inter checker flags (#957)
JasonGross May 3, 2023
c7b8d8f
Fix use of lazy for (s)prop_level
mattam82 May 5, 2023
e04bc87
Add MCListable class for enumerating finite types
JasonGross May 5, 2023
c67d968
Merge pull request #962 from JasonGross/coq-8.16+listable
tabareau May 9, 2023
713dbde
Bump cachix/install-nix-action from 20 to 21 (#966)
dependabot[bot] Jun 19, 2023
f1f2028
Merge pull request #955 from JasonGross/coq-8.16+global-env-merge
yforster Jun 19, 2023
6899a1a
Fix a sneaky Prop <= Type use messing up certified erasure
mattam82 Jun 28, 2023
f5967d8
Update dependabot.yml to also update other branches
JasonGross Jul 5, 2023
a738c55
Update dependabot.yml to check main, not master
JasonGross Jul 5, 2023
e8d0b36
Bump cachix/install-nix-action from 21 to 22 (#970)
dependabot[bot] Jul 5, 2023
943cc72
Bump cachix/install-nix-action from 21 to 22 (#973)
dependabot[bot] Jul 5, 2023
555b239
Bump actions/checkout from 3 to 4 (#977)
dependabot[bot] Sep 4, 2023
7723421
Bump cachix/install-nix-action from 22 to 23 (#979)
dependabot[bot] Sep 4, 2023
00a4299
Drastically speed up ByteCompareSpec
JasonGross Sep 30, 2023
9f7cc51
Merge pull request #988 from JasonGross/coq-8.16+bytecomparespec-better
ppedrot Oct 2, 2023
241dd7f
Merge remote-tracking branch 'origin/coq-8.16' into coq-8.17
yforster Oct 16, 2023
34c831e
fix Makefile
yforster Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,27 @@ updates:
interval: "daily"
labels:
- "dependencies"
- package-ecosystem: "github-actions"
directory: "/"
target-branch: "main"
schedule:
# Check for updates to GitHub Actions every weekday
interval: "daily"
labels:
- "dependencies"
- package-ecosystem: "github-actions"
directory: "/"
target-branch: "coq-8.17"
schedule:
# Check for updates to GitHub Actions every weekday
interval: "daily"
labels:
- "dependencies"
- package-ecosystem: "github-actions"
directory: "/"
target-branch: "coq-8.16"
schedule:
# Check for updates to GitHub Actions every weekday
interval: "daily"
labels:
- "dependencies"
12 changes: 6 additions & 6 deletions .github/nix-action-coq-8.17-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ env.tested_commit }}
- name: Cachix install
uses: cachix/install-nix-action@v20
uses: cachix/install-nix-action@v23
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- name: Cachix setup metacoq
Expand Down Expand Up @@ -54,12 +54,12 @@ jobs:
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ env.tested_commit }}
- name: Cachix install
uses: cachix/install-nix-action@v20
uses: cachix/install-nix-action@v23
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- name: Cachix setup metacoq
Expand Down Expand Up @@ -99,12 +99,12 @@ jobs:
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ env.tested_commit }}
- name: Cachix install
uses: cachix/install-nix-action@v20
uses: cachix/install-nix-action@v23
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- name: Cachix setup metacoq
Expand Down
12 changes: 6 additions & 6 deletions .github/nix-action-coq-8.17-ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ env.tested_commit }}
- name: Cachix install
uses: cachix/install-nix-action@v20
uses: cachix/install-nix-action@v23
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- name: Cachix setup metacoq
Expand Down Expand Up @@ -54,12 +54,12 @@ jobs:
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ env.tested_commit }}
- name: Cachix install
uses: cachix/install-nix-action@v20
uses: cachix/install-nix-action@v23
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- name: Cachix setup metacoq
Expand Down Expand Up @@ -99,12 +99,12 @@ jobs:
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ env.tested_commit }}
- name: Cachix install
uses: cachix/install-nix-action@v20
uses: cachix/install-nix-action@v23
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- name: Cachix setup metacoq
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

all: printconf template-coq pcuic safechecker erasure erasure-plugin
all: printconf template-coq pcuic safechecker erasure erasure-plugin

-include Makefile.conf

Expand All @@ -26,7 +26,7 @@ else
endif
endif

install: all translations
install: all
$(MAKE) -C utils install
$(MAKE) -C common install
$(MAKE) -C template-coq install
Expand Down Expand Up @@ -176,7 +176,7 @@ cleanplugins:

ci-local-noclean:
./configure.sh local
$(MAKE) all test-suite TIMED=pretty-timed
$(MAKE) all translations test-suite TIMED=pretty-timed

ci-local: ci-local-noclean
$(MAKE) clean
Expand Down
1 change: 1 addition & 0 deletions common/_CoqProject.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ theories/MonadBasicAst.v
theories/Environment.v
theories/Reflect.v
theories/EnvironmentTyping.v
theories/EnvironmentReflect.v
theories/EnvMap.v
theories/Transform.v
Loading
Loading