CI cleanup.

This commit is contained in:
Benjamin Summers 2019-12-10 23:39:52 -08:00
parent 2bdd861ebb
commit e2765f3d2d
6 changed files with 59 additions and 54 deletions

View File

@ -8,66 +8,31 @@ cache:
- $HOME/.stack
- $TRAVIS_BUILD_DIR/.stack-work
install:
before_install:
- git lfs pull
# King Haskell
# Using compiler above sets CC to an invalid value, so unset it
- unset CC
- CABALARGS=""
- export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$HOME/.local/bin:/opt/alex/$ALEXVER/bin:/opt/happy/$HAPPYVER/bin:$HOME/.cabal/bin:$PATH
- | # Install stack
mkdir -p ~/.local/bin
# travis_retry curl -L https://get.haskellstack.org/stable/osx-x86_64.tar.gz | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin
mkdir -p tmp
travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz -C tmp
mv tmp/stack-*/stack ~/.local/bin
# Use the more reliable S3 mirror of Hackage
mkdir -p $HOME/.cabal
echo 'remote-repo: hackage.haskell.org:http://hackage.fpcomplete.com/' > $HOME/.cabal/config
echo 'remote-repo-cache: $HOME/.cabal/packages' >> $HOME/.cabal/config
- sh/travis-install-stack
install:
- nix-env -iA cachix -f https://cachix.org/api/v1/install
# King Haskell
- echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
- SAVED_OPTIONS=$(set +o)
- set -ex
- stack --no-terminal --install-ghc build lmdb-static
- stack --no-terminal --install-ghc build king --only-dependencies
- eval "$SAVED_OPTIONS"
script:
- echo hi
# - cachix use urbit2
# - ./sh/cachix || true
- cachix use urbit2
- ./sh/cachix || true
- make build-fast
- make release
- sh/ci-tests
# - make
# - make release
# King Haskell
# - export PATH="${PATH}:$(pwd)/bin"
- stack build king --fast
- stack install king --local-bin-path ./bin
- stack test king --fast
# # otool -L ./bin/king-linux64-demo
# - mv bin/king release/king-linux64-demo
# - sh/ci-tests
# deploy:
# - skip_cleanup: true
# provider: gcs
# access_key_id: GOOGTADOPP55X5ZTH3IKAXQW
# secret_access_key:
# secure: rSPif0VHX3Q3QpWM9iUt/Z9sicCY8ABuwVFPeT3YUnAAmSXM46PIHKieoGs79kx9IelFyQsM8xS0XWyt4S/haR7VaTJY+zHJjf0AnA1sr5ZIV70t3K0SXzq4+E1ffOZRiC0VmHatPz10wjaIpHxpjcROqQV4M1dBCq2H/rpccIE=
# bucket: bootstrap.urbit.org
# local-dir: release/
# acl: public-read
# on:
# condition: "-d release/"
# repo: urbit/urbit
# all_branches: true
deploy:
- skip_cleanup: true
provider: gcs
access_key_id: GOOGTADOPP55X5ZTH3IKAXQW
secret_access_key:
secure: rSPif0VHX3Q3QpWM9iUt/Z9sicCY8ABuwVFPeT3YUnAAmSXM46PIHKieoGs79kx9IelFyQsM8xS0XWyt4S/haR7VaTJY+zHJjf0AnA1sr5ZIV70t3K0SXzq4+E1ffOZRiC0VmHatPz10wjaIpHxpjcROqQV4M1dBCq2H/rpccIE=
bucket: bootstrap.urbit.org
local-dir: release/
acl: public-read
on:
condition: "-d release/"
repo: urbit/urbit
all_branches: true

View File

@ -2,6 +2,11 @@
build:
nix-build -A urbit -A herb --no-out-link
stack build king
build-fast:
nix-build -A urbit -A herb --no-out-link
stack build king --fast
build-all:
nix-build --no-out-link

View File

@ -2,6 +2,8 @@
set -ex
stack test king --fast
if [ "$TRAVIS_PULL_REQUEST" = false ]
then

View File

@ -14,6 +14,13 @@ fi
mkdir -p release
stack clean # Make sure we optimize
stack install king --local-bin-path ./release
mv release/king release/king-linux64-$ver
# OSX
# otool -L ./release/king-darwin-$ver
for plat in linux64 darwin
do
sh/cross urbit "$plat"

View File

@ -2,6 +2,8 @@
set -e
stack test king --fast
pkg=$(nix-build nix/ops -A test --no-out-link "$@")
hdr () {

24
sh/travis-install-stack Executable file
View File

@ -0,0 +1,24 @@
#!/usr/bin/env bash
set -ex
mkdir -p ~/.local/bin
# OSX
# travis_retry curl -L https://get.haskellstack.org/stable/osx-x86_64.tar.gz | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin
mkdir -p tmp
pax="https://get.haskellstack.org/stable/linux-x86_64.tar.gz"
travis_retry curl -L $pax | tar xz -C tmp
mv tmp/stack-*/stack ~/.local/bin
# Use the more reliable S3 mirror of Hackage
mkdir -p ~/.cabal
cat > ~/.cabal/config <<EOF
remote-repo: hackage.haskell.org:http://hackage.fpcomplete.com/
remote-repo-cache: $HOME/.cabal/packages
EOF