Skip to content

Commit

Permalink
Merge pull request #83 from kape1395/support-dune-build-deps
Browse files Browse the repository at this point in the history
Dune based build
  • Loading branch information
damiendoligez authored Oct 23, 2023
2 parents 98556bb + 8f5c5c8 commit 87a4f4c
Show file tree
Hide file tree
Showing 185 changed files with 1,576 additions and 12,093 deletions.
39 changes: 16 additions & 23 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ jobs:
'2',
]
steps:
- name: Install deps
if: matrix.operating-system == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install --yes time
- name: Set up Python
uses: actions/setup-python@v2
with:
Expand All @@ -34,41 +39,29 @@ jobs:
- uses: ocaml/setup-ocaml@v2
with:
ocaml-compiler: ${{ env.OCAML_VERSION }}
# - uses: actions/cache@v3
# id: cache
# with:
# path: _build_cache
# key: ${{ runner.os }}_build_cache
- name: Build installer of TLAPS
run: |
eval $(opam env)
./configure
cd tools/installer
./tlaps-release.sh
- name: Define TLAPS-related env vars
run: |
python .github/workflows/setup_shell_env.py \
>> $GITHUB_ENV
- name: Run installer of TLAPS
run: |
./tools/installer/\
${{ env.INSTALLER }} -d .
- name: Install dependencies for testing
run: |
opam install kaputt
opam install ./ --deps-only --yes
make
make release
- name: Run a subset of `tlapm` tests
run: |
eval $(opam env)
PATH=$(pwd)/bin:$(pwd)/lib/tlaps/bin:$PATH make test
make test-inline test-fast-basic
- name: Run all `tlapm` tests
if: >-
matrix.operating-system == 'ubuntu-latest' &&
matrix.ocaml-compiler == '2'
run: |
ls -lah
eval $(opam env)
ocaml --version
make
PATH=$(pwd)/bin:$(pwd)/lib/tlaps/bin:$PATH which tlapm
PATH=$(pwd)/bin:$(pwd)/lib/tlaps/bin:$PATH which zenon
PATH=$(pwd)/bin:$(pwd)/lib/tlaps/bin:$PATH tlapm --version
PATH=$(pwd)/bin:$(pwd)/lib/tlaps/bin:$PATH make testall
make test
- name: Print Test Results
if: matrix.operating-system == 'ubuntu-latest'
run: |
cat test/tests.log
cat _build/default/test/tests.log
41 changes: 17 additions & 24 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and Package TLA Proof Manager
name: Build on PR
on:
pull_request:
push:
Expand All @@ -22,6 +22,11 @@ jobs:
'2',
]
steps:
- name: Install deps
if: matrix.operating-system == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install --yes time
- name: Set up Python
uses: actions/setup-python@v2
with:
Expand All @@ -38,38 +43,26 @@ jobs:
- uses: ocaml/setup-ocaml@v2
with:
ocaml-compiler: ${{ env.OCAML_VERSION }}
- name: Define TLAPS-related env vars
run: |
python .github/workflows/setup_shell_env.py \
>> $GITHUB_ENV
- uses: actions/cache@v2
id: cache
with:
path: ${{ env.DOWNLOADS }}
key: ${{ env.DOWNLOADS }}
# - uses: actions/cache@v3
# id: cache
# with:
# path: _build_cache
# key: ${{ runner.os }}_build_cache
- name: Build installer of TLAPS
run: |
eval $(opam env)
./configure
cd tools/installer
./tlaps-release.sh
- name: Run installer of TLAPS
run: |
./tools/installer/\
${{ env.INSTALLER }} -d .
- name: Install dependencies for testing
run: |
opam install kaputt
opam install ./ --deps-only --yes
make
make release
- name: Run a subset of `tlapm` tests
run: |
eval $(opam env)
PATH=$(pwd)/bin:$(pwd)/lib/tlaps/bin:$PATH make test
make test-inline test-fast-basic
- name: Run all `tlapm` tests
run: |
eval $(opam env)
make
PATH=$(pwd)/bin:$(pwd)/lib/tlaps/bin:$PATH make testall
make test
- name: Print Test Results
if: matrix.operating-system == 'ubuntu-latest'
run: |
cat test/tests.log
cat _build/default/test/tests.log
39 changes: 17 additions & 22 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ jobs:
'2',
]
steps:
- name: Install deps
if: matrix.operating-system == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install --yes time
- name: Set up Python
uses: actions/setup-python@v2
with:
Expand Down Expand Up @@ -100,32 +105,22 @@ jobs:
- uses: ocaml/setup-ocaml@v2
with:
ocaml-compiler: ${{ env.OCAML_VERSION }}
- name: Define TLAPS-related env vars
run: |
python .github/workflows/setup_shell_env.py \
>> $GITHUB_ENV
- uses: actions/cache@v2
id: cache
with:
path: ${{ env.DOWNLOADS }}
key: ${{ env.DOWNLOADS }}
# - uses: actions/cache@v3
# id: cache
# with:
# path: _build_cache
# key: ${{ runner.os }}_build_cache
- name: Build installer of TLAPS
run: |
eval $(opam env)
./configure
cd tools/installer
./tlaps-release.sh
- name: Run installer of TLAPS
run: |
./tools/installer/\
${{ env.INSTALLER }} -d .
- name: Install dependencies for testing
run: |
opam install kaputt
opam install ./ --deps-only --yes
make
make release
echo "TLAPM_RELEASE_FILE=$(make release-print-file)" >> "$GITHUB_ENV"
- name: Run a subset of `tlapm` tests
run: |
eval $(opam env)
PATH=$(pwd)/bin:$(pwd)/lib/tlaps/bin:$PATH make test
make test-inline test-fast-basic
- name: Upload Release Asset
if: matrix.ocaml-compiler == '2'
id: upload-release-asset
Expand All @@ -134,6 +129,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.get_release_info.outputs.upload_url }}
asset_path: tools/installer/${{ env.INSTALLER }}
asset_name: ${{ env.INSTALLER }}
asset_path: _build/${{ env.TLAPM_RELEASE_FILE }}
asset_name: ${{ env.TLAPM_RELEASE_FILE }}
asset_content_type: application/octet-stream
47 changes: 0 additions & 47 deletions .github/workflows/setup_shell_env.py

This file was deleted.

62 changes: 0 additions & 62 deletions .github/workflows/tlapm_version.py

This file was deleted.

26 changes: 3 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,15 @@
*.err
*.out
*.toolbox
*.tlacache
*.tlaps
*.log
.DS_Store

/_build/
/_build_cache/
/.vscode/

/Makefile
/config.log
/config.status
/src/alexer.ml
/src/config.ml
/src/load.ml
/src/tlapm.native
# directories created when building the installer
/tlaps-*-x86_64-linux-gnu/
/tlaps-*-i386-darwin/
# generated installer files
/tools/installer/tlaps-*-x86_64-linux-gnu-inst.bin
/tools/installer/tlaps-*-i386-darwin-inst.bin
# generated release scripts
/tools/installer/tlaps-release.sh
/tools/installer/tlaps-source-release.sh
# `tlapm` binary
tlapm
# installation for testing,
# created by the installer
/test/bin/
/test/lib/
/tlaps-*.tar.gz

__pycache__/
*.pyc
Loading

0 comments on commit 87a4f4c

Please sign in to comment.