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

[8.20] Bump MetaCoq version #260

Merged
merged 2 commits into from
Jan 29, 2025
Merged

[8.20] Bump MetaCoq version #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57fca63
Bump MetaCoq version
4ever2 Jan 29, 2025
9c5a251
Update coq-nix-toolbox
4ever2 Jan 29, 2025
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
21 changes: 7 additions & 14 deletions .github/coq-concert.opam.locked
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,19 @@ bug-reports: "https://github.com/AU-COBRA/ConCert/issues"
depends: [
"coq" {= "8.20.0"}
"coq-bignums" {= "9.0.0+coq8.20"}
"coq-metacoq-common" {= "1.3.2+8.20"}
"coq-metacoq-erasure" {= "1.3.2+8.20"}
"coq-metacoq-pcuic" {= "1.3.2+8.20"}
"coq-metacoq-safechecker" {= "1.3.2+8.20"}
"coq-metacoq-template" {= "1.3.2+8.20"}
"coq-metacoq-template-pcuic" {= "1.3.2+8.20"}
"coq-metacoq-utils" {= "1.3.2+8.20"}
"coq-metacoq-common" {= "1.3.4+8.20"}
"coq-metacoq-erasure" {= "1.3.4+8.20"}
"coq-metacoq-pcuic" {= "1.3.4+8.20"}
"coq-metacoq-safechecker" {= "1.3.4+8.20"}
"coq-metacoq-template" {= "1.3.4+8.20"}
"coq-metacoq-template-pcuic" {= "1.3.4+8.20"}
"coq-metacoq-utils" {= "1.3.4+8.20"}
"coq-rust-extraction" {= "dev"}
"coq-elm-extraction" {= "0.1.0"}
"coq-quickchick" {= "2.0.4"}
"coq-stdpp" {= "1.11.0"}
]
pin-depends: [
["coq-metacoq-utils.1.3.2+8.20" "git+https://github.com/MetaCoq/metacoq.git#ea3ed3c4b0d05508ce744f17a56c880c5f47c816"]
["coq-metacoq-common.1.3.2+8.20" "git+https://github.com/MetaCoq/metacoq.git#ea3ed3c4b0d05508ce744f17a56c880c5f47c816"]
["coq-metacoq-template.1.3.2+8.20" "git+https://github.com/MetaCoq/metacoq.git#ea3ed3c4b0d05508ce744f17a56c880c5f47c816"]
["coq-metacoq-template-pcuic.1.3.2+8.20" "git+https://github.com/MetaCoq/metacoq.git#ea3ed3c4b0d05508ce744f17a56c880c5f47c816"]
["coq-metacoq-pcuic.1.3.2+8.20" "git+https://github.com/MetaCoq/metacoq.git#ea3ed3c4b0d05508ce744f17a56c880c5f47c816"]
["coq-metacoq-safechecker.1.3.2+8.20" "git+https://github.com/MetaCoq/metacoq.git#ea3ed3c4b0d05508ce744f17a56c880c5f47c816"]
["coq-metacoq-erasure.1.3.2+8.20" "git+https://github.com/MetaCoq/metacoq.git#ea3ed3c4b0d05508ce744f17a56c880c5f47c816"]
["coq-rust-extraction.dev" "git+https://github.com/AU-COBRA/coq-rust-extraction.git#c5d9cbae417213fe25b42f08678f28507cc6b99e"]
]
build: [
Expand Down
45 changes: 21 additions & 24 deletions .github/workflows/nix-action-8.20.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ jobs:
- id: stepGetDerivation
name: Getting derivation for current job (ConCert)
run: "NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr bundle
\"8.20\" --argstr job \"ConCert\" \\\n --dry-run &> out || (touch
\"8.20\" --argstr job \"ConCert\" \\\n --dry-run 2> err > out || (touch
fail; true)\n"
- name: Error reporting
run: "echo \"out=\"; cat out\n"
run: "echo \"out=\"; cat out\necho \"err=\"; cat err\n"
- name: Failure check
run: if [ -e fail ]; then exit 1; else exit 0; fi;
- id: stepCheck
name: Checking presence of CI target for current job
run: (echo -n status=; cat out | grep "built:" | sed "s/.*/built/") >> $GITHUB_OUTPUT
run: (echo -n status=; cat out err | grep "built:" | sed "s/.*/built/") >> $GITHUB_OUTPUT
- if: steps.stepCheck.outputs.status == 'built'
name: 'Building/fetching previous CI target: coq'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
Expand Down Expand Up @@ -128,15 +128,15 @@ jobs:
- id: stepGetDerivation
name: Getting derivation for current job (ElmExtraction)
run: "NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr bundle
\"8.20\" --argstr job \"ElmExtraction\" \\\n --dry-run &> out || (touch
\"8.20\" --argstr job \"ElmExtraction\" \\\n --dry-run 2> err > out || (touch
fail; true)\n"
- name: Error reporting
run: "echo \"out=\"; cat out\n"
run: "echo \"out=\"; cat out\necho \"err=\"; cat err\n"
- name: Failure check
run: if [ -e fail ]; then exit 1; else exit 0; fi;
- id: stepCheck
name: Checking presence of CI target for current job
run: (echo -n status=; cat out | grep "built:" | sed "s/.*/built/") >> $GITHUB_OUTPUT
run: (echo -n status=; cat out err | grep "built:" | sed "s/.*/built/") >> $GITHUB_OUTPUT
- if: steps.stepCheck.outputs.status == 'built'
name: 'Building/fetching previous CI target: coq'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
Expand Down Expand Up @@ -190,15 +190,15 @@ jobs:
- id: stepGetDerivation
name: Getting derivation for current job (QuickChick)
run: "NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr bundle
\"8.20\" --argstr job \"QuickChick\" \\\n --dry-run &> out || (touch
\"8.20\" --argstr job \"QuickChick\" \\\n --dry-run 2> err > out || (touch
fail; true)\n"
- name: Error reporting
run: "echo \"out=\"; cat out\n"
run: "echo \"out=\"; cat out\necho \"err=\"; cat err\n"
- name: Failure check
run: if [ -e fail ]; then exit 1; else exit 0; fi;
- id: stepCheck
name: Checking presence of CI target for current job
run: (echo -n status=; cat out | grep "built:" | sed "s/.*/built/") >> $GITHUB_OUTPUT
run: (echo -n status=; cat out err | grep "built:" | sed "s/.*/built/") >> $GITHUB_OUTPUT
- if: steps.stepCheck.outputs.status == 'built'
name: 'Building/fetching previous CI target: coq'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
Expand Down Expand Up @@ -261,15 +261,15 @@ jobs:
- id: stepGetDerivation
name: Getting derivation for current job (RustExtraction)
run: "NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr bundle
\"8.20\" --argstr job \"RustExtraction\" \\\n --dry-run &> out ||
\"8.20\" --argstr job \"RustExtraction\" \\\n --dry-run 2> err > out ||
(touch fail; true)\n"
- name: Error reporting
run: "echo \"out=\"; cat out\n"
run: "echo \"out=\"; cat out\necho \"err=\"; cat err\n"
- name: Failure check
run: if [ -e fail ]; then exit 1; else exit 0; fi;
- id: stepCheck
name: Checking presence of CI target for current job
run: (echo -n status=; cat out | grep "built:" | sed "s/.*/built/") >> $GITHUB_OUTPUT
run: (echo -n status=; cat out err | grep "built:" | sed "s/.*/built/") >> $GITHUB_OUTPUT
- if: steps.stepCheck.outputs.status == 'built'
name: 'Building/fetching previous CI target: coq'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
Expand Down Expand Up @@ -322,15 +322,15 @@ jobs:
- id: stepGetDerivation
name: Getting derivation for current job (coq)
run: "NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr bundle
\"8.20\" --argstr job \"coq\" \\\n --dry-run &> out || (touch fail;
\"8.20\" --argstr job \"coq\" \\\n --dry-run 2> err > out || (touch fail;
true)\n"
- name: Error reporting
run: "echo \"out=\"; cat out\n"
run: "echo \"out=\"; cat out\necho \"err=\"; cat err\n"
- name: Failure check
run: if [ -e fail ]; then exit 1; else exit 0; fi;
- id: stepCheck
name: Checking presence of CI target for current job
run: (echo -n status=; cat out | grep "built:" | sed "s/.*/built/") >> $GITHUB_OUTPUT
run: (echo -n status=; cat out err | grep "built:" | sed "s/.*/built/") >> $GITHUB_OUTPUT
- if: steps.stepCheck.outputs.status == 'built'
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
Expand Down Expand Up @@ -376,15 +376,15 @@ jobs:
- id: stepGetDerivation
name: Getting derivation for current job (metacoq)
run: "NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr bundle
\"8.20\" --argstr job \"metacoq\" \\\n --dry-run &> out || (touch
\"8.20\" --argstr job \"metacoq\" \\\n --dry-run 2> err > out || (touch
fail; true)\n"
- name: Error reporting
run: "echo \"out=\"; cat out\n"
run: "echo \"out=\"; cat out\necho \"err=\"; cat err\n"
- name: Failure check
run: if [ -e fail ]; then exit 1; else exit 0; fi;
- id: stepCheck
name: Checking presence of CI target for current job
run: (echo -n status=; cat out | grep "built:" | sed "s/.*/built/") >> $GITHUB_OUTPUT
run: (echo -n status=; cat out err | grep "built:" | sed "s/.*/built/") >> $GITHUB_OUTPUT
- if: steps.stepCheck.outputs.status == 'built'
name: 'Building/fetching previous CI target: coq'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
Expand Down Expand Up @@ -454,15 +454,15 @@ jobs:
- id: stepGetDerivation
name: Getting derivation for current job (stdpp)
run: "NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr bundle
\"8.20\" --argstr job \"stdpp\" \\\n --dry-run &> out || (touch fail;
\"8.20\" --argstr job \"stdpp\" \\\n --dry-run 2> err > out || (touch fail;
true)\n"
- name: Error reporting
run: "echo \"out=\"; cat out\n"
run: "echo \"out=\"; cat out\necho \"err=\"; cat err\n"
- name: Failure check
run: if [ -e fail ]; then exit 1; else exit 0; fi;
- id: stepCheck
name: Checking presence of CI target for current job
run: (echo -n status=; cat out | grep "built:" | sed "s/.*/built/") >> $GITHUB_OUTPUT
run: (echo -n status=; cat out err | grep "built:" | sed "s/.*/built/") >> $GITHUB_OUTPUT
- if: steps.stepCheck.outputs.status == 'built'
name: 'Building/fetching previous CI target: coq'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
Expand Down Expand Up @@ -497,6 +497,3 @@ on:
push:
branches:
- master
concurrency:
group: "${{ github.workflow }}-${{ github.event.pull_request.number || github.head_ref || github.ref }}"
cancel-in-progress: true
4 changes: 2 additions & 2 deletions .nix/config.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@

bundles."8.20" = {
coqPackages.coq.override.version = "8.20";
coqPackages.metacoq.override.version = "coq-8.20";
coqPackages.metacoq.override.version = "1.3.4-8.20";
coqPackages.stdpp.override.version = "1.11.0";
coqPackages.QuickChick.override.version = "2.0.4";
coqPackages.RustExtraction.override.version = "coq-8.20";
coqPackages.RustExtraction.override.version = "c5d9cbae417213fe25b42f08678f28507cc6b99e";
coqPackages.ElmExtraction.override.version = "0.1.0";
};

Expand Down
2 changes: 1 addition & 1 deletion .nix/coq-nix-toolbox.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"78d95509824be9e3339c1c0ee19f9c085f32b23e"
"a1f630a232a3e2c739df99d0a947bf7465d2f8bb"
21 changes: 7 additions & 14 deletions coq-concert.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,19 @@ depends: [
"coq" {>= "8.20" & < "8.21~"}
"coq-bignums" {>= "8"}
"coq-quickchick" {>= "2.0.4"}
"coq-metacoq-utils" {>= "1.3.1" & < "1.4~"}
"coq-metacoq-common" {>= "1.3.1" & < "1.4~"}
"coq-metacoq-template" {>= "1.3.1" & < "1.4~"}
"coq-metacoq-template-pcuic" {>= "1.3.1" & < "1.4~"}
"coq-metacoq-pcuic" {>= "1.3.1" & < "1.4~"}
"coq-metacoq-safechecker" {>= "1.3.1" & < "1.4~"}
"coq-metacoq-erasure" {>= "1.3.1" & < "1.4~"}
"coq-metacoq-utils" {>= "1.3.4" & < "1.4~"}
"coq-metacoq-common" {>= "1.3.4" & < "1.4~"}
"coq-metacoq-template" {>= "1.3.4" & < "1.4~"}
"coq-metacoq-template-pcuic" {>= "1.3.4" & < "1.4~"}
"coq-metacoq-pcuic" {>= "1.3.4" & < "1.4~"}
"coq-metacoq-safechecker" {>= "1.3.4" & < "1.4~"}
"coq-metacoq-erasure" {>= "1.3.4" & < "1.4~"}
"coq-rust-extraction" {= "dev"}
"coq-elm-extraction" {= "0.1.0"}
"coq-stdpp" {>= "1.10.0" & < "1.12~"}
]

pin-depends: [
["coq-metacoq-utils.1.3.2+8.20" "git+https://github.com/MetaCoq/metacoq.git#ea3ed3c4b0d05508ce744f17a56c880c5f47c816"]
["coq-metacoq-common.1.3.2+8.20" "git+https://github.com/MetaCoq/metacoq.git#ea3ed3c4b0d05508ce744f17a56c880c5f47c816"]
["coq-metacoq-template.1.3.2+8.20" "git+https://github.com/MetaCoq/metacoq.git#ea3ed3c4b0d05508ce744f17a56c880c5f47c816"]
["coq-metacoq-template-pcuic.1.3.2+8.20" "git+https://github.com/MetaCoq/metacoq.git#ea3ed3c4b0d05508ce744f17a56c880c5f47c816"]
["coq-metacoq-pcuic.1.3.2+8.20" "git+https://github.com/MetaCoq/metacoq.git#ea3ed3c4b0d05508ce744f17a56c880c5f47c816"]
["coq-metacoq-safechecker.1.3.2+8.20" "git+https://github.com/MetaCoq/metacoq.git#ea3ed3c4b0d05508ce744f17a56c880c5f47c816"]
["coq-metacoq-erasure.1.3.2+8.20" "git+https://github.com/MetaCoq/metacoq.git#ea3ed3c4b0d05508ce744f17a56c880c5f47c816"]
["coq-rust-extraction.dev" "git+https://github.com/AU-COBRA/coq-rust-extraction.git#c5d9cbae417213fe25b42f08678f28507cc6b99e"]
]

Expand Down
Loading