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

Add Tactician to the platform #423

Draft
wants to merge 40 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
d278742
Test tactician
LasseBlaauwbroek Apr 11, 2024
98f9f0b
Run CI on tactician branch
LasseBlaauwbroek Apr 11, 2024
4dd681c
Merge branch 'main' into tactician
LasseBlaauwbroek Apr 11, 2024
09c13ad
Typo
LasseBlaauwbroek Apr 11, 2024
6ae7b8b
downgrade dune
LasseBlaauwbroek Apr 11, 2024
8da0810
Inject tactician
LasseBlaauwbroek Apr 11, 2024
9643806
Debug
LasseBlaauwbroek Apr 11, 2024
6b00bdd
Debug
LasseBlaauwbroek Apr 11, 2024
aac260c
Debug
LasseBlaauwbroek Apr 11, 2024
1468bf2
debug3
LasseBlaauwbroek Apr 11, 2024
2ddddd3
debug4
LasseBlaauwbroek Apr 11, 2024
bd8cab8
debug5
LasseBlaauwbroek Apr 11, 2024
dbd34f7
debug6
LasseBlaauwbroek Apr 11, 2024
51066ff
Debug 7
LasseBlaauwbroek Apr 11, 2024
124dbf6
Disable smoke tests
LasseBlaauwbroek Apr 11, 2024
a5c274d
Debug more
LasseBlaauwbroek Apr 11, 2024
7d00da2
Debug
LasseBlaauwbroek Apr 11, 2024
ed8da65
Debug x
LasseBlaauwbroek Apr 11, 2024
778d712
Full pick
LasseBlaauwbroek Apr 11, 2024
ee3291b
Pre-install z3
LasseBlaauwbroek Apr 11, 2024
250ac40
Don't install z3 in cygwin
LasseBlaauwbroek Apr 11, 2024
e0ad332
Dev version
LasseBlaauwbroek Apr 11, 2024
0354734
Fix
LasseBlaauwbroek Apr 11, 2024
76dfd11
Install z3 first
LasseBlaauwbroek Apr 11, 2024
750a2b9
Run CI
LasseBlaauwbroek Jul 18, 2024
9120673
Run CI
LasseBlaauwbroek Jul 18, 2024
f9fdda3
Merge remote-tracking branch 'upstream/main' into tactician
LasseBlaauwbroek Jul 18, 2024
0e587d3
Do ocamlfind pin earlier
LasseBlaauwbroek Jul 18, 2024
fd4810f
Fix
LasseBlaauwbroek Jul 18, 2024
11eb265
Downgrade opam-client for windows
LasseBlaauwbroek Jul 18, 2024
35f3e04
Note
LasseBlaauwbroek Jul 18, 2024
839b5df
CI
LasseBlaauwbroek Jul 18, 2024
c56440d
Cleanup
LasseBlaauwbroek Jul 19, 2024
3bdeb30
CI
LasseBlaauwbroek Jul 24, 2024
9e0190c
CI
LasseBlaauwbroek Jul 24, 2024
57d14e7
CI
LasseBlaauwbroek Jul 25, 2024
5abba6e
CI
LasseBlaauwbroek Jul 25, 2024
daa9ee6
CI
LasseBlaauwbroek Jul 25, 2024
941efe2
CI
LasseBlaauwbroek Jul 25, 2024
0b70d9b
CI
LasseBlaauwbroek Jul 25, 2024
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
13 changes: 7 additions & 6 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
- 2021.02
- 2021.09
- main
- tactician
pull_request:
branches:
- '**'
Expand Down Expand Up @@ -51,10 +52,10 @@ jobs:
matrix:
variant:
# Keep this in sync with the Smoke test below
- '8.19~2024.01+beta1'
# - '8.19~2024.01+beta1'
- '8.18~2023.11'
- '8.18~mc2'
- '8.17~2023.08'
# - '8.18~mc2'
# - '8.17~2023.08'
steps:
- name: Git checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -169,10 +170,10 @@ jobs:
fail-fast: false
matrix:
variant:
- '8.19~2024.01+beta1'
# - '8.19~2024.01+beta1'
- '8.18~2023.11'
- '8.18~mc2'
- '8.17~2023.08'
# - '8.18~mc2'
# - '8.17~2023.08'

steps:
- name: Install bash
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
- 2021.02
- 2021.09
- main
- tactician
pull_request:
branches:
- '**'
Expand Down Expand Up @@ -58,16 +59,16 @@ jobs:
matrix:
variant:
# This should contain all picks introduced in the current release + all original picks of all Coq versions
- '8.19~2024.01+beta1'
# - '8.19~2024.01+beta1'
- '8.18~2023.11'
- '8.18~mc2'
- '8.17~2023.08'
- '8.16~2022.09'
- '8.15~2022.09'
- '8.15~2022.04'
- '8.14~2022.01'
- '8.13~2021.02'
- '8.12'
# - '8.18~mc2'
# - '8.17~2023.08'
# - '8.16~2022.09'
# - '8.15~2022.09'
# - '8.15~2022.04'
# - '8.14~2022.01'
# - '8.13~2021.02'
# - '8.12'

steps:
- name: Git checkout
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
push:
branches:
- main
- tactician
pull_request:
branches:
- '**'
Expand Down Expand Up @@ -51,10 +52,10 @@ jobs:
- '64'
variant:
# Keep this in sync with the Smoke test below
- '8.19~2024.01+beta1'
# - '8.19~2024.01+beta1'
- '8.18~2023.11'
- '8.18~mc2'
- '8.17~2023.08'
# - '8.18~mc2'
# - '8.17~2023.08'

steps:
- name: Set git to use LF
Expand Down
2 changes: 1 addition & 1 deletion package_picks/package-pick-8.18~2023.11.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ COQ_PLATFORM_COQ_BRANCH='v8.18'
COQ_PLATFORM_COQ_TAG='8.18.0'

# This controls if opam repositories for development packages are selected
COQ_PLATFORM_USE_DEV_REPOSITORY='N'
COQ_PLATFORM_USE_DEV_REPOSITORY='Y'

# This extended descriptions is used for readme files
COQ_PLATFORM_VERSION_DESCRIPTION='This version of Coq Platform 2023.11.0 includes Coq 8.18.0 from Sep 2023. '
Expand Down
35 changes: 31 additions & 4 deletions shell_scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,38 @@ opam config set jobs $COQ_PLATFORM_JOBS
# One can rise it as root on MacOS, but only for a root shell, not for the current shell
ulimit -S -s 65520

if ! $COQ_PLATFORM_TIME opam pin -n ocamlfind 1.9.5~relocatable; then dump_opam_logs; fi

if [[ "$OSTYPE" == cygwin ]]
then
if ! $COQ_PLATFORM_TIME opam pin -n opam-client 2.1.0; then dump_opam_logs; fi # opam-clinet 2.2.0 doesn't want to compile on Windows
fi

if [[ "$OSTYPE" != cygwin ]]
then
if ! $COQ_PLATFORM_TIME opam pin -n z3 4.11.2; then dump_opam_logs; fi # Installing z3 later will cause Tactician to be recompiled
if ! $COQ_PLATFORM_TIME opam install z3; then dump_opam_logs; fi
fi

if ! $COQ_PLATFORM_TIME opam pin -n dune 3.15.3; then dump_opam_logs; fi
if ! $COQ_PLATFORM_TIME opam pin -n coq-tactician-dummy 8.17.dev; then dump_opam_logs; fi
if ! $COQ_PLATFORM_TIME opam pin -n coq-tactician 8.18.dev; then dump_opam_logs; fi
if ! $COQ_PLATFORM_TIME opam pin -n coq-core 8.18.0; then dump_opam_logs; fi
if ! $COQ_PLATFORM_TIME opam install dune coq-core coq-tactician-dummy coq-tactician ocamlfind; then dump_opam_logs; fi

opam switch
opam switch set ${COQ_PLATFORM_SWITCH_NAME}
opam switch
eval $(opam env --set-switch --switch ${COQ_PLATFORM_SWITCH_NAME})
opam switch

opam exec -- tactician inject

case "$COQ_PLATFORM_PARALLEL" in
[pP])
echo "===== INSTALL OPAM PACKAGES (PARALLEL) ====="
if ! $COQ_PLATFORM_TIME opam install ${PACKAGES//PIN.}; then dump_opam_logs; fi
for package in ${PACKAGES}
[pP])
echo "===== INSTALL OPAM PACKAGES (PARALLEL) ====="
if ! $COQ_PLATFORM_TIME opam install ${PACKAGES//PIN.}; then dump_opam_logs; fi
for package in ${PACKAGES}
do
case $package in
PIN.*)
Expand Down
Loading