Merge pull request #83 from kape1395/support-dune-build-deps

Dune based build
tlaplus · Oct 23, 2023 · 87a4f4c · 87a4f4c
2 parents 98556bb + 8f5c5c8
commit 87a4f4c
Show file tree

Hide file tree

Showing 185 changed files with 1,576 additions and 12,093 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -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:
@@ -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
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -1,4 +1,4 @@
-name: Build and Package TLA Proof Manager
+name: Build on PR
 on:
     pull_request:
     push:
@@ -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:
@@ -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
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -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:
@@ -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
@@ -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
diff --git a/.github/workflows/setup_shell_env.py b/.github/workflows/setup_shell_env.py
diff --git a/.github/workflows/tlapm_version.py b/.github/workflows/tlapm_version.py
diff --git a/.gitignore b/.gitignore
@@ -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