Skip to content
This repository has been archived by the owner on Aug 14, 2019. It is now read-only.

Commit

Permalink
Merge pull request #1015 from urbit/release-candidate
Browse files Browse the repository at this point in the history
release
  • Loading branch information
joemfb authored Jan 18, 2019
2 parents 7610c12 + 62f20d8 commit 0038ec0
Show file tree
Hide file tree
Showing 404 changed files with 49,693 additions and 34,503 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
/sec/**/*.atom
*.swp
*.swo
41 changes: 31 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,39 @@
language: node_js
node_js:
- 4

before_install:
# building vere directly in lieu of a working debian package script
# pwd: ~/urbit/arvo
- cd ../
- wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip
- unzip ninja-linux.zip
- sudo mv ninja /usr/bin/

install:
# pwd: ~/urbit
- pip3 install --user -I meson==0.44.1
- git clone https://github.com/urbit/urbit
- cd ./urbit
# pwd: ~/urbit/urbit
- git checkout $(cat ../arvo/.travis/pin-vere-commit.txt)
- ./scripts/bootstrap
- ./scripts/build
- sudo ninja -C build install
- cd ../arvo
# pwd: ~/urbit/arvo

before_script:
- cd .travis
- wget -i pin-urbit-release.url -O ./urbit.deb
- sudo apt install ./urbit.deb
before_script: bash get-or-build-pill.sh
# pwd: ~/urbit/arvo/.travis
- npm install
- bash get-or-build-pill.sh
# https://github.com/travis-ci/travis-ci/issues/2570

script:
- ulimit -c unlimited -S
- npm run -s test; bash print-core-backtrace.sh $?

before_deploy: "[ -d piers ] || { mkdir piers && tar cvzSf piers/zod-$TRAVIS_COMMIT.tgz zod/; }"

addons:
Expand All @@ -19,17 +46,11 @@ addons:
- openssl
- libssl-dev
- libncurses5-dev
- automake
- autoconf
- make
- libtool
- g++
- re2c
- gcc
- libcurl4-gnutls-dev
- unzip
- gdb


deploy:
- skip_cleanup: true
provider: gcs
Expand Down
14 changes: 10 additions & 4 deletions .travis/get-or-build-pill.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
set -euo pipefail
set -x

# add urbit-runner to $PATH
PATH=./node_modules/.bin/:$PATH

# XX use -s instead of hash pill
HASH=$(git -C .. log -1 HEAD --format=%H -- sys/)
export PILL_NAME="git-${HASH:0:10}"
Expand All @@ -26,17 +29,20 @@ mkdir prev
: Pilling: trying pinned fakezod
wget -i pin-parent-pill-pier.url -O - | tar xvz -C prev/ &&
: Downloaded prev/zod &&
lsc ./in-urbit.ls -FI zod prev/zod <<' .'
urbit-runner -S prev/zod <<' .'
|autoload |
|mount %
.
[ $? = 0 ] && cp -r ../sys prev/zod/home/
[ $? = 0 ] && cp -r ../sys prev/zod/home/ &&
cp ../gen/solid.hoon prev/zod/home/gen/ &&
cp ../lib/pill.hoon prev/zod/home/lib/
} || {
: Pilling: Parent-pill pier not available, trying preceding pill commit
HASH2=$(git -C .. log -2 $HASH --format=%H -- sys/ | tail -1)
PILL_NAME2="git-${HASH2:0:10}"
wget https://bootstrap.urbit.org/$PILL_NAME2.pill -O prev/urbit.pill &&
lsc ./in-urbit.ls -A .. -B prev/urbit.pill -cFI zod prev/zod <<' .'
([ -d prev/zod ] && rm -r prev/zod || true) &&
urbit-runner -A .. -B prev/urbit.pill -cSF zod prev/zod <<' .'
%booted-prev-zod
.
} || {
Expand All @@ -45,7 +51,7 @@ mkdir prev
}
: Pier created, soliding actual pill
lsc ./in-urbit.ls -FI zod prev/zod <<.
urbit-runner -S prev/zod <<.
|label %home %$PILL_NAME
.urbit/pill +solid /==/$PILL_NAME/sys, =dub &
.
Expand Down
15 changes: 0 additions & 15 deletions .travis/in-urbit.ls

This file was deleted.

Loading

0 comments on commit 0038ec0

Please sign in to comment.