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

Also test standalone builds on CI #170

Merged
merged 2 commits into from
Oct 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 26 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
fail-fast: false
matrix:
python-version: [3.5, 3.6, 3.7, 3.8, 3.11]
test-location: ['installed', 'local']
test-location: ['installed', 'local', 'standalone']
env:
- { COQ_VERSION: "8.15.0", COQ_PACKAGE: "coq-8.14.0", PPA: "ppa:jgross-h/many-coq-versions-ocaml-4-08", os: "ubuntu-20.04" }
- { COQ_VERSION: "8.14.1", COQ_PACKAGE: "coq-8.14.1", PPA: "ppa:jgross-h/many-coq-versions-ocaml-4-08", os: "ubuntu-20.04" }
Expand Down Expand Up @@ -58,30 +58,43 @@ jobs:
- name: make doctests
run: make doctests PYTHON3=python
if: ${{ matrix.python-version != '2.7' }}
- name: install package building deps
- name: install package building deps (pip)
run: |
python -m pip install setuptools wheel twine
if: ${{ matrix.test-location == 'installed' }}
- name: Build package
- name: install package building deps (standalone)
run: |
python -m pip install pyinstaller
if: ${{ matrix.test-location == 'standalone' }}
- name: Build package (dist)
run: make dist
if: ${{ matrix.test-location == 'installed' }}
- name: Build package (standalone)
run: make standalone
if: ${{ matrix.test-location == 'standalone' }}
- name: Test install
run: python -m pip install .
if: ${{ matrix.test-location == 'installed' }}
- name: Test (local)
run: make print-support && make has-all-tests && make check PYTHON=python CAT_ALL_LOGS=1
if: ${{ matrix.test-location != 'installed' }}
if: ${{ matrix.test-location == 'local' }}
- name: Test (installed)
run: make print-support && make has-all-tests && make check PYTHON=python FIND_BUG=coq-bug-minimizer CAT_ALL_LOGS=1
if: ${{ matrix.test-location == 'installed' }}
- name: Test (standalone)
run: make print-support && make has-all-tests && make check PYTHON=python FIND_BUG=dist/coq-bug-minimizer/coq-bug-minimizer CAT_ALL_LOGS=1
if: ${{ matrix.test-location == 'standalone' }}

docker-build:
strategy:
fail-fast: false
matrix:
coq-version: ['dev', '8.18', '8.17', '8.16', '8.15', '8.14', '8.13', '8.12', '8.11', '8.10', '8.9', '8.8', '8.7', '8.6', '8.5', '8.4']
ocaml-version: ['default']
test-location: ['installed', 'local']
test-location: ['installed', 'local', 'standalone']
exclude: # work around https://github.com/coq-community/docker-coq/issues/59
- coq-version: '8.5'
test-location: 'standalone'

runs-on: ubuntu-latest
concurrency:
Expand Down Expand Up @@ -117,6 +130,14 @@ jobs:
python3 -m pip install .
endGroup
make check PYTHON=python3 FIND_BUG=coq-bug-minimizer CAT_ALL_LOGS=1
elif [ "${{ matrix.test-location }}" == "standalone" ]; then
startGroup 'install package building deps'
python3 -m pip install pyinstaller
endGroup
startGroup 'Build package'
make standalone PYTHON=python3
endGroup
make check PYTHON=python3 FIND_BUG=dist/coq-bug-minimizer/coq-bug-minimizer CAT_ALL_LOGS=1
else
make check PYTHON=python3 CAT_ALL_LOGS=1
fi
Expand Down
9 changes: 8 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
FIND_BUG?=
ifneq (,$(strip $(FIND_BUG)))
FULL_FIND_BUG:=$(abspath $(shell which '$(FIND_BUG)'))
else
FULL_FIND_BUG=$(FIND_BUG)
endif

has-all-tests check print-support::
$(MAKE) -C examples $@
$(MAKE) -C examples $@ FIND_BUG='$(FULL_FIND_BUG)'

.PHONY: has-all-tests check print-support

Expand Down
3 changes: 0 additions & 3 deletions examples/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,6 @@ COQLIB_V_FILES:=$(wildcard $(COQC_COQLIB)/theories/Init/*.v)
COQLIB_GLOB_FILES:=$(wildcard $(COQC_COQLIB)/theories/Init/*.glob)
COQLIB_PRELUDE_V_FILE:=$(wildcard $(COQC_COQLIB)/theories/Init/Prelude.v)
COQLIB_PRELUDE_GLOB_FILE:=$(wildcard $(COQC_COQLIB)/theories/Init/Prelude.glob)
FIND_BUG?=

export FIND_BUG

.PHONY: check
check::
Expand Down
3 changes: 3 additions & 0 deletions examples/init-settings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ if [ -z "${FIND_BUG}" ]; then
${PYTHON} "${FIND_BUG_PY}" "$@"
}
else
export FIND_BUG="$(cd "$DIR" && realpath "$(which "${FIND_BUG}")")"
function find_bug() {
"${FIND_BUG}" "$@"
}
Expand All @@ -26,6 +27,7 @@ if [ -z "${MINIMIZE_REQUIRES}" ]; then
${PYTHON} "${MINIMIZE_REQUIRES_PY}" "$@"
}
else
export MINIMIZE_REQUIRES="$(cd "$DIR" && realpath "$(which "${MINIMIZE_REQUIRES}")")"
function minimize_requires() {
"${MINIMIZE_REQUIRES}" "$@"
}
Expand All @@ -38,6 +40,7 @@ if [ -z "${ABSOLUTIZE_IMPORTS}" ]; then
${PYTHON} "${ABSOLUTIZE_IMPORTS_PY}" "$@"
}
else
export ABSOLUTIZE_IMPORTS="$(cd "$DIR" && realpath "$(which "${ABSOLUTIZE_IMPORTS}")")"
function absolutize_imports() {
"${ABSOLUTIZE_IMPORTS}" "$@"
}
Expand Down