Skip to content

Commit

Permalink
Merge pull request #4 from wz1000/hie-bios-wz1000
Browse files Browse the repository at this point in the history
Fix a bunch of stuff
  • Loading branch information
mpickering committed Jul 23, 2019
2 parents daf0be5 + 805961d commit 0d3af55
Show file tree
Hide file tree
Showing 153 changed files with 3,523 additions and 3,443 deletions.
32 changes: 32 additions & 0 deletions .azure/linux-installhs-stack.yml
@@ -0,0 +1,32 @@
jobs:
- job: Linux_installhs_Stack
timeoutInMinutes: 0
pool:
vmImage: ubuntu-16.04
strategy:
matrix:
shake:
YAML_FILE: install/shake.yaml
steps:
- bash: |
export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root
mkdir -p ~/.local/bin
curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | \
tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
displayName: Install stack
- bash: |
source .azure/linux.bashrc
stack setup --stack-yaml $(YAML_FILE)
displayName: Install GHC
- bash: |
source .azure/linux.bashrc
stack --stack-yaml $(YAML_FILE) --install-ghc build --only-dependencies
displayName: Build dependencies
- bash: |
source .azure/linux.bashrc
stack build --stack-yaml $(YAML_FILE)
displayName: Build `hie-install`
- bash: |
source .azure/linux.bashrc
stack install.hs help
displayName: Run help of `instal.hs`
68 changes: 68 additions & 0 deletions .azure/linux-stack.yml
@@ -0,0 +1,68 @@
jobs:
- job: Linux_Stack
timeoutInMinutes: 0
pool:
vmImage: ubuntu-16.04
strategy:
matrix:
stack-def:
YAML_FILE: stack.yaml
stack-8.6.5:
YAML_FILE: stack-8.6.5.yaml
stack-8.6.4:
YAML_FILE: stack-8.6.4.yaml
stack-8.6.3:
YAML_FILE: stack-8.6.3.yaml
stack-8.6.2:
YAML_FILE: stack-8.6.2.yaml
stack-8.6.1:
YAML_FILE: stack-8.6.1.yaml
stack-8.4.4:
YAML_FILE: stack-8.4.4.yaml
stack-8.4.3:
YAML_FILE: stack-8.4.3.yaml
stack-8.4.2:
YAML_FILE: stack-8.4.2.yaml
stack-8.2.2:
YAML_FILE: stack-8.2.2.yaml
steps:
- bash: |
git submodule sync
git submodule update --init
displayName: Sync submodules
- bash: |
export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root
mkdir -p ~/.local/bin
curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | \
tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
displayName: Install stack
- bash: |
source .azure/linux.bashrc
stack setup --stack-yaml $(YAML_FILE)
displayName: Install GHC
- bash: |
source .azure/linux.bashrc
stack --stack-yaml $(YAML_FILE) --install-ghc build --only-dependencies
displayName: Build dependencies
- bash: |
source .azure/linux.bashrc
stack build --stack-yaml $(YAML_FILE)
displayName: Build `hie`
- bash: |
source .azure/linux.bashrc
stack build --stack-yaml $(YAML_FILE) --test --bench --only-dependencies
stack install --stack-yaml $(YAML_FILE) # `hie` binary required for tests
stack --stack-yaml $(YAML_FILE) exec hoogle generate
displayName: Build Test-dependencies
- bash: |
sudo apt update
sudo apt install z3
displayName: "Install Runtime Test-Dependencies: z3"
- bash: |
source .azure/linux.bashrc
stack install --resolver=lts-11.18 liquid-fixpoint-0.7.0.7 dotgen-0.4.2 fgl-visualize-0.1.0.1 located-base-0.1.1.1 liquidhaskell-0.8.2.4
displayName: "Install Runtime Test-Dependencies: liquidhaskell"
# - bash: |
# source .azure/linux.bashrc
# stack test --stack-yaml $(YAML_FILE)
# displayName: Run Test
1 change: 1 addition & 0 deletions .azure/linux.bashrc
@@ -0,0 +1 @@
export PATH=$HOME/.local/bin:$PATH
32 changes: 32 additions & 0 deletions .azure/macos-installhs-stack.yml
@@ -0,0 +1,32 @@
jobs:
- job: MacOs_installhs_Stack
timeoutInMinutes: 0
pool:
vmImage: macOS-10.13
strategy:
matrix:
shake:
YAML_FILE: install/shake.yaml
steps:
- bash: |
export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root
mkdir -p ~/.local/bin
curl -skL https://get.haskellstack.org/stable/osx-x86_64.tar.gz | \
tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin;
displayName: Install stack
- bash: |
source .azure/macos.bashrc
stack setup --stack-yaml $(YAML_FILE)
displayName: Install GHC
- bash: |
source .azure/macos.bashrc
stack --stack-yaml $(YAML_FILE) --install-ghc build --only-dependencies
displayName: Build dependencies
- bash: |
source .azure/macos.bashrc
stack build --stack-yaml $(YAML_FILE)
displayName: Build `hie-install`
- bash: |
source .azure/macos.bashrc
stack install.hs help
displayName: Run help of `instal.hs`
65 changes: 65 additions & 0 deletions .azure/macos-stack.yml
@@ -0,0 +1,65 @@
jobs:
- job: MacOs_Stack
timeoutInMinutes: 0
pool:
vmImage: macOS-10.13
strategy:
matrix:
stack-def:
YAML_FILE: stack.yaml
stack-8.6.5:
YAML_FILE: stack-8.6.5.yaml
stack-8.6.4:
YAML_FILE: stack-8.6.4.yaml
stack-8.6.3:
YAML_FILE: stack-8.6.3.yaml
stack-8.4.4:
YAML_FILE: stack-8.4.4.yaml
stack-8.4.3:
YAML_FILE: stack-8.4.3.yaml
stack-8.4.2:
YAML_FILE: stack-8.4.2.yaml
stack-8.2.2:
YAML_FILE: stack-8.2.2.yaml
steps:
- bash: |
git submodule sync
git submodule update --init
displayName: Sync submodules
- bash: |
export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root
mkdir -p ~/.local/bin
curl -skL https://get.haskellstack.org/stable/osx-x86_64.tar.gz | \
tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin;
displayName: Install stack
- bash: |
source .azure/macos.bashrc
stack setup --stack-yaml $(YAML_FILE)
displayName: Install GHC
- bash: |
source .azure/macos.bashrc
stack --stack-yaml $(YAML_FILE) --install-ghc build --only-dependencies
displayName: Build dependencies
- bash: |
source .azure/macos.bashrc
stack build --stack-yaml $(YAML_FILE)
displayName: Build `hie`
- bash: |
source .azure/macos.bashrc
stack build --stack-yaml $(YAML_FILE) --test --bench --only-dependencies
stack install --stack-yaml $(YAML_FILE) # `hie` binary required for tests
stack --stack-yaml $(YAML_FILE) exec hoogle generate
displayName: Build Test-dependencies
- bash: |
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
brew update
brew install z3
displayName: "Install Runtime Test-Dependencies: z3"
- bash: |
source .azure/macos.bashrc
stack install --resolver=lts-11.18 liquid-fixpoint-0.7.0.7 dotgen-0.4.2 fgl-visualize-0.1.0.1 located-base-0.1.1.1 liquidhaskell-0.8.2.4
displayName: "Install Runtime Test-Dependencies: liquidhaskell"
# - bash: |
# source .azure/macos.bashrc
# stack test --stack-yaml $(YAML_FILE)
# displayName: Run Test
1 change: 1 addition & 0 deletions .azure/macos.bashrc
@@ -0,0 +1 @@
export PATH=$HOME/.local/bin:$PATH
37 changes: 37 additions & 0 deletions .azure/windows-installhs-cabal.yml
@@ -0,0 +1,37 @@
jobs:
- job: Windows_installhs_Cabal
timeoutInMinutes: 0
pool:
vmImage: windows-2019
variables:
YAML_FILE: install/shake.yaml
PROJECT_FILE: install/shake.project
steps:
- bash: |
curl -sSkL http://www.stackage.org/stack/windows-x86_64 -o /usr/bin/stack.zip
unzip -o /usr/bin/stack.zip -d /usr/bin/
displayName: Install stack
- bash: |
source .azure/windows.bashrc
stack setup --stack-yaml $(YAML_FILE)
displayName: Install GHC
- bash: |
source .azure/windows.bashrc
stack install cabal-install --stack-yaml $(YAML_FILE)
displayName: Install `cabal-install`
- bash: |
source .azure/windows.bashrc
cabal update
displayName: update cabal
# - bash: |
# source .azure/windows.bashrc
# stack --stack-yaml $(YAML_FILE) build --only-dependencies
# displayName: Build dependencies
- bash: |
source .azure/windows.bashrc
cabal v2-build hie-install -w $(stack path --stack-yaml $(YAML_FILE) --compiler-exe) --project-file $(PROJECT_FILE)
displayName: Build `hie-install`
- bash: |
source .azure/windows.bashrc
cabal v2-run install.hs -w $(stack path --stack-yaml $(YAML_FILE) --compiler-exe) --project-file $(PROJECT_FILE) help
displayName: Run help of `install.hs`
30 changes: 30 additions & 0 deletions .azure/windows-installhs-stack.yml
@@ -0,0 +1,30 @@
jobs:
- job: Windows_installhs_Stack
timeoutInMinutes: 0
pool:
vmImage: windows-2019
strategy:
matrix:
shake:
YAML_FILE: install/shake.yaml
steps:
- bash: |
curl -sSkL http://www.stackage.org/stack/windows-x86_64 -o /usr/bin/stack.zip
unzip -o /usr/bin/stack.zip -d /usr/bin/
displayName: Install stack
- bash: |
source .azure/windows.bashrc
stack setup --stack-yaml $(YAML_FILE)
displayName: Install GHC
- bash: |
source .azure/windows.bashrc
stack --stack-yaml $(YAML_FILE) --install-ghc build --only-dependencies
displayName: Build dependencies
- bash: |
source .azure/windows.bashrc
stack build --stack-yaml $(YAML_FILE)
displayName: Build `hie-install`
- bash: |
source .azure/windows.bashrc
stack install.hs help
displayName: Run help of `instal.hs`
67 changes: 67 additions & 0 deletions .azure/windows-stack.yml
@@ -0,0 +1,67 @@
jobs:
- job: Windows_Stack
timeoutInMinutes: 0
pool:
vmImage: windows-2019
strategy:
matrix:
stack-def:
YAML_FILE: stack.yaml
stack-8.6.5:
YAML_FILE: stack-8.6.5.yaml
stack-8.6.4:
YAML_FILE: stack-8.6.4.yaml
stack-8.6.2:
YAML_FILE: stack-8.6.2.yaml
stack-8.6.1:
YAML_FILE: stack-8.6.1.yaml
stack-8.4.4:
YAML_FILE: stack-8.4.4.yaml
stack-8.4.3:
YAML_FILE: stack-8.4.3.yaml
stack-8.4.2:
YAML_FILE: stack-8.4.2.yaml
stack-8.2.2:
YAML_FILE: stack-8.2.2.yaml
steps:
- bash: |
git submodule sync
git submodule update --init
displayName: Sync submodules
- bash: |
curl -sSkL http://www.stackage.org/stack/windows-x86_64 -o /usr/bin/stack.zip
unzip -o /usr/bin/stack.zip -d /usr/bin/
displayName: Install stack
- bash: |
source .azure/windows.bashrc
stack setup --stack-yaml $(YAML_FILE)
displayName: Install GHC
- bash: |
source .azure/windows.bashrc
stack --stack-yaml $(YAML_FILE) --install-ghc build --only-dependencies
displayName: Build dependencies
- bash: |
source .azure/windows.bashrc
stack build --stack-yaml $(YAML_FILE)
displayName: Build `hie`
- bash: |
source .azure/windows.bashrc
stack build --stack-yaml $(YAML_FILE) --test --bench --only-dependencies
stack install --stack-yaml $(YAML_FILE) # `hie` binary required for tests
stack exec --stack-yaml $(YAML_FILE) hoogle generate
displayName: Build Test-dependencies
- bash: |
# TODO: try to install automatically (`choco install z3` fails and pacman is not installed)
mkdir -p /usr/local
curl -L https://github.com/Z3Prover/z3/releases/download/Z3-4.8.5/z3-4.8.5-x64-win.zip -o /usr/local/z3.zip
unzip -o /usr/local/z3.zip -d /usr/local/
displayName: "Install Runtime Test-Dependencies: z3"
- bash: |
source .azure/windows.bashrc
stack install --resolver=lts-11.18 liquid-fixpoint-0.7.0.7 dotgen-0.4.2 fgl-visualize-0.1.0.1 located-base-0.1.1.1 liquidhaskell-0.8.2.4
liquid -v
displayName: "Install Runtime Test-Dependencies: liquidhaskell"
# - bash: |
# source .azure/windows.bashrc
# stack test --stack-yaml $(YAML_FILE) :unit-test
# displayName: Run Test
4 changes: 4 additions & 0 deletions .azure/windows.bashrc
@@ -0,0 +1,4 @@
export STACK_ROOT="C:\\sr"
export LOCAL_BIN_PATH=$(cygpath $APPDATA\\local\\bin)
export Z3_BIN_PATH=/usr/local/z3-4.8.5-x64-win/bin
export PATH=$Z3_BIN_PATH:$LOCAL_BIN_PATH:$PATH
1 change: 0 additions & 1 deletion .circleci/config.yml
Expand Up @@ -195,7 +195,6 @@ workflows:
version: 2
multiple-ghcs:
jobs:
- ghc-8.2.1
- ghc-8.2.2
- ghc-8.4.2
- ghc-8.4.3
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Expand Up @@ -69,4 +69,8 @@ test-results/
.vscode

# shake build information
_build/
_build/

# stack 2.1 stack.yaml lock files
stack*.yaml.lock
shake.yaml.lock
9 changes: 4 additions & 5 deletions .gitmodules
Expand Up @@ -13,11 +13,7 @@
[submodule "submodules/HaRe"]
path = submodules/HaRe
# url = https://github.com/bubba/HaRe.git
url = https://github.com/alanz/HaRe.git

[submodule "submodules/brittany"]
path = submodules/brittany
url = https://github.com/lspitzner/brittany.git
url = https://github.com/wz1000/HaRe.git

[submodule "submodules/cabal-helper"]
path = submodules/cabal-helper
Expand All @@ -30,3 +26,6 @@
# url = https://github.com/arbor/ghc-mod.git
url = https://github.com/alanz/ghc-mod.git
#url = https://github.com/mpickering/ghc-mod.git
[submodule "hie-bios"]
path = hie-bios
url = https://github.com/mpickering/hie-bios

0 comments on commit 0d3af55

Please sign in to comment.