Skip to content

Commit 1075c72

Browse files
proux01proux01
committed
[CI] Drop Analysis on 8.18
1 parent b96d434 commit 1075c72

File tree

2 files changed

+4
-141
lines changed

2 files changed

+4
-141
lines changed

‎.github/workflows/nix-action-coq-8.18.yml‎

Lines changed: 0 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,78 +1085,6 @@ jobs:
10851085
name: Building/fetching current CI target
10861086
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.18"
10871087
--argstr job "mathcomp-algebra"
1088-
mathcomp-analysis:
1089-
needs:
1090-
- coq
1091-
- mathcomp-classical
1092-
- mathcomp-field
1093-
- mathcomp-bigenough
1094-
- hierarchy-builder
1095-
runs-on: ubuntu-latest
1096-
steps:
1097-
- name: Determine which commit to initially checkout
1098-
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"target_commit=${{\
1099-
\ github.sha }}\" >> $GITHUB_ENV\nelse\n echo \"target_commit=${{ github.event.pull_request.head.sha\
1100-
\ }}\" >> $GITHUB_ENV\nfi\n"
1101-
- name: Git checkout
1102-
uses: actions/checkout@v4
1103-
with:
1104-
fetch-depth: 0
1105-
ref: ${{ env.target_commit }}
1106-
- name: Determine which commit to test
1107-
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
1108-
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
1109-
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
1110-
\ | cut -f1)\n mergeable=$(git merge --no-commit --no-ff ${{ github.event.pull_request.base.sha\
1111-
\ }} > /dev/null 2>&1; echo $?; git merge --abort > /dev/null 2>&1 || true)\n\
1112-
\ if [ -z \"$merge_commit\" -o \"x$mergeable\" != \"x0\" ]; then\n echo\
1113-
\ \"tested_commit=${{ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n\
1114-
\ else\n echo \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
1115-
- name: Git checkout
1116-
uses: actions/checkout@v4
1117-
with:
1118-
fetch-depth: 0
1119-
ref: ${{ env.tested_commit }}
1120-
- name: Cachix install
1121-
uses: cachix/install-nix-action@v27
1122-
with:
1123-
nix_path: nixpkgs=channel:nixpkgs-unstable
1124-
- name: Cachix setup math-comp
1125-
uses: cachix/cachix-action@v15
1126-
with:
1127-
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
1128-
extraPullNames: coq, coq-community
1129-
name: math-comp
1130-
- id: stepCheck
1131-
name: Checking presence of CI target mathcomp-analysis
1132-
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
1133-
\ bundle \"coq-8.18\" --argstr job \"mathcomp-analysis\" \\\n --dry-run\
1134-
\ 2>&1 > /dev/null)\necho $nb_dry_run\necho status=$(echo $nb_dry_run | grep\
1135-
\ \"built:\" | sed \"s/.*/built/\") >> $GITHUB_OUTPUT\n"
1136-
- if: steps.stepCheck.outputs.status == 'built'
1137-
name: 'Building/fetching previous CI target: coq'
1138-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.18"
1139-
--argstr job "coq"
1140-
- if: steps.stepCheck.outputs.status == 'built'
1141-
name: 'Building/fetching previous CI target: mathcomp-classical'
1142-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.18"
1143-
--argstr job "mathcomp-classical"
1144-
- if: steps.stepCheck.outputs.status == 'built'
1145-
name: 'Building/fetching previous CI target: mathcomp-field'
1146-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.18"
1147-
--argstr job "mathcomp-field"
1148-
- if: steps.stepCheck.outputs.status == 'built'
1149-
name: 'Building/fetching previous CI target: mathcomp-bigenough'
1150-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.18"
1151-
--argstr job "mathcomp-bigenough"
1152-
- if: steps.stepCheck.outputs.status == 'built'
1153-
name: 'Building/fetching previous CI target: hierarchy-builder'
1154-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.18"
1155-
--argstr job "hierarchy-builder"
1156-
- if: steps.stepCheck.outputs.status == 'built'
1157-
name: Building/fetching current CI target
1158-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.18"
1159-
--argstr job "mathcomp-analysis"
11601088
mathcomp-bigenough:
11611089
needs:
11621090
- coq
@@ -1296,73 +1224,6 @@ jobs:
12961224
name: Building/fetching current CI target
12971225
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.18"
12981226
--argstr job "mathcomp-character"
1299-
mathcomp-classical:
1300-
needs:
1301-
- coq
1302-
- mathcomp-algebra
1303-
- mathcomp-finmap
1304-
- hierarchy-builder
1305-
runs-on: ubuntu-latest
1306-
steps:
1307-
- name: Determine which commit to initially checkout
1308-
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"target_commit=${{\
1309-
\ github.sha }}\" >> $GITHUB_ENV\nelse\n echo \"target_commit=${{ github.event.pull_request.head.sha\
1310-
\ }}\" >> $GITHUB_ENV\nfi\n"
1311-
- name: Git checkout
1312-
uses: actions/checkout@v4
1313-
with:
1314-
fetch-depth: 0
1315-
ref: ${{ env.target_commit }}
1316-
- name: Determine which commit to test
1317-
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
1318-
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
1319-
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
1320-
\ | cut -f1)\n mergeable=$(git merge --no-commit --no-ff ${{ github.event.pull_request.base.sha\
1321-
\ }} > /dev/null 2>&1; echo $?; git merge --abort > /dev/null 2>&1 || true)\n\
1322-
\ if [ -z \"$merge_commit\" -o \"x$mergeable\" != \"x0\" ]; then\n echo\
1323-
\ \"tested_commit=${{ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n\
1324-
\ else\n echo \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
1325-
- name: Git checkout
1326-
uses: actions/checkout@v4
1327-
with:
1328-
fetch-depth: 0
1329-
ref: ${{ env.tested_commit }}
1330-
- name: Cachix install
1331-
uses: cachix/install-nix-action@v27
1332-
with:
1333-
nix_path: nixpkgs=channel:nixpkgs-unstable
1334-
- name: Cachix setup math-comp
1335-
uses: cachix/cachix-action@v15
1336-
with:
1337-
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
1338-
extraPullNames: coq, coq-community
1339-
name: math-comp
1340-
- id: stepCheck
1341-
name: Checking presence of CI target mathcomp-classical
1342-
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
1343-
\ bundle \"coq-8.18\" --argstr job \"mathcomp-classical\" \\\n --dry-run\
1344-
\ 2>&1 > /dev/null)\necho $nb_dry_run\necho status=$(echo $nb_dry_run | grep\
1345-
\ \"built:\" | sed \"s/.*/built/\") >> $GITHUB_OUTPUT\n"
1346-
- if: steps.stepCheck.outputs.status == 'built'
1347-
name: 'Building/fetching previous CI target: coq'
1348-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.18"
1349-
--argstr job "coq"
1350-
- if: steps.stepCheck.outputs.status == 'built'
1351-
name: 'Building/fetching previous CI target: mathcomp-algebra'
1352-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.18"
1353-
--argstr job "mathcomp-algebra"
1354-
- if: steps.stepCheck.outputs.status == 'built'
1355-
name: 'Building/fetching previous CI target: mathcomp-finmap'
1356-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.18"
1357-
--argstr job "mathcomp-finmap"
1358-
- if: steps.stepCheck.outputs.status == 'built'
1359-
name: 'Building/fetching previous CI target: hierarchy-builder'
1360-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.18"
1361-
--argstr job "hierarchy-builder"
1362-
- if: steps.stepCheck.outputs.status == 'built'
1363-
name: Building/fetching current CI target
1364-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.18"
1365-
--argstr job "mathcomp-classical"
13661227
mathcomp-field:
13671228
needs:
13681229
- coq

‎.nix/config.nix‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
coqeal.override.version = "master";
2424
};
2525
in {
26-
"coq-master".coqPackages = mcHBcommon // {
26+
"coq-master" = { coqPackages = mcHBcommon // {
2727
coq.override.version = "master";
2828
coq-elpi.override.version = "master";
2929
bignums.override.version = "master";
3030
paramcoq.override.version = "master";
31+
}; ocamlPackages = { elpi.override.version = "v1.19.5"; };
3132
};
32-
"coq-master".ocamlPackages = { elpi.override.version = "v1.19.5"; };
3333

3434
"coq-8.20".coqPackages = mcHBcommon // {
3535
coq.override.version = "8.20";
@@ -41,6 +41,8 @@
4141

4242
"coq-8.18".coqPackages = mcHBcommon // {
4343
coq.override.version = "8.18";
44+
mathcomp-classical.job = false; # Analysis no longer supports 8.18
45+
mathcomp-analysis.job = false;
4446
};
4547

4648
};

0 commit comments

Comments
 (0)