Revert "Revert "Include cryptol-remote-api in Cryptol builds (#890)""

This reverts commit f048368408.
This commit is contained in:
Aaron Tomb 2020-09-29 15:35:29 -07:00
parent ec9a8ba27d
commit 2e2e263c33
5 changed files with 9 additions and 0 deletions

2
.github/ci.sh vendored
View File

@ -46,6 +46,7 @@ setup_dist_bins() {
is_exe "dist/bin" "cryptol" && is_exe "dist/bin" "cryptol-html" && return is_exe "dist/bin" "cryptol" && is_exe "dist/bin" "cryptol-html" && return
extract_exe "cryptol" "dist/bin" extract_exe "cryptol" "dist/bin"
extract_exe "cryptol-html" "dist/bin" extract_exe "cryptol-html" "dist/bin"
extract_exe "cryptol-remote-api" "dist/bin"
strip dist/bin/cryptol* || echo "Strip failed: Ignoring harmless error" strip dist/bin/cryptol* || echo "Strip failed: Ignoring harmless error"
} }
@ -112,6 +113,7 @@ build() {
cabal v2-update cabal v2-update
cabal v2-configure -j2 --minimize-conflict-set cabal v2-configure -j2 --minimize-conflict-set
retry ./cry build exe:cryptol-html "$@" # retry due to flakiness with windows builds retry ./cry build exe:cryptol-html "$@" # retry due to flakiness with windows builds
cabal v2-build cryptol-remote-api
} }
install_system_deps() { install_system_deps() {

View File

@ -4,6 +4,7 @@ on:
branches: ["actions/**"] branches: ["actions/**"]
schedule: schedule:
- cron: "0 0 * * *" - cron: "0 0 * * *"
workflow_dispatch:
jobs: jobs:
outputs: outputs:

3
.gitmodules vendored
View File

@ -1,3 +1,6 @@
[submodule "examples/cryptol-specs"] [submodule "examples/cryptol-specs"]
path = examples/cryptol-specs path = examples/cryptol-specs
url = https://github.com/GaloisInc/cryptol-specs.git url = https://github.com/GaloisInc/cryptol-specs.git
[submodule "deps/argo"]
path = deps/argo
url = https://github.com/galoisinc/argo

View File

@ -1,3 +1,5 @@
packages: packages:
cryptol.cabal cryptol.cabal
tests tests
deps/argo/argo
deps/argo/cryptol-remote-api

1
deps/argo vendored Submodule

@ -0,0 +1 @@
Subproject commit 7c6bd32044321a63ce5039bdaf48662bd33a905f