From 5a412016dbd2950a6a8b1d23b288bc331f77bf4d Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Fri, 8 Dec 2017 15:56:33 -0800 Subject: [PATCH 1/3] use github .deb release instead of pinned CI binary --- .travis.yml | 9 +++------ .travis/get-or-build-pill.sh | 2 +- .travis/pin-urbit-release.url | 1 - .travis/test.ls | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 .travis/pin-urbit-release.url diff --git a/.travis.yml b/.travis.yml index 0c4d36153..562205f66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,13 +2,10 @@ language: node_js # ish, mainly used as an entry point node_js: - 4 before_install: - - cd .travis # keep main directory clear + - wget https://github.com/urbit/urbit/releases/download/v0.5.1/urbit_0.5-1_amd64.deb + - sudo apt install ./urbit_0.5-1_amd64.deb - - > - wget $(cat ./pin-urbit-release.url)/urbit -O ./urbit && - chmod +x ./urbit; - echo "FIXME downloaded raw urbit binary releaseinstead of .deb"; - echo "FIXME used full pinned url instead of tag name" + - cd .travis # keep main directory clear before_script: bash get-or-build-pill.sh diff --git a/.travis/get-or-build-pill.sh b/.travis/get-or-build-pill.sh index 76b9d78d8..f5ad1df57 100644 --- a/.travis/get-or-build-pill.sh +++ b/.travis/get-or-build-pill.sh @@ -45,7 +45,7 @@ do require! <[ stream-snitch once recursive-copy wait-on ]> pty = require \pty.js - urbit = pty.spawn './urbit' <[-FI zod prev/zod]> + urbit = pty.spawn 'urbit' <[-FI zod prev/zod]> .on \data -> process.stdout.write it on-next = (re,cb)-> diff --git a/.travis/pin-urbit-release.url b/.travis/pin-urbit-release.url deleted file mode 100644 index 9ff2d562b..000000000 --- a/.travis/pin-urbit-release.url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/urbit/urbit/releases/download/redefault-0.5.1 diff --git a/.travis/test.ls b/.travis/test.ls index 016773b07..6836ceab1 100644 --- a/.travis/test.ls +++ b/.travis/test.ls @@ -3,7 +3,7 @@ pty = require \pty.js urbit = # TODO abort on failure - pty.spawn './urbit' <[-B urbit.pill -A .. -cFI zod zod]> + pty.spawn 'urbit' <[-B urbit.pill -A .. -cFI zod zod]> .on \data -> process.stdout.write it urbit.on \exit (code)-> From 9ca88b9a06c3df359a9c58643adf70b33c0f1cc3 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Fri, 8 Dec 2017 16:08:29 -0800 Subject: [PATCH 2/3] move .deb download to .travis so it doesn't get synced in --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 562205f66..ad3883422 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,11 @@ language: node_js # ish, mainly used as an entry point node_js: - 4 before_install: + - cd .travis # keep main directory clear + - wget https://github.com/urbit/urbit/releases/download/v0.5.1/urbit_0.5-1_amd64.deb - sudo apt install ./urbit_0.5-1_amd64.deb - - cd .travis # keep main directory clear before_script: bash get-or-build-pill.sh From 7ebb3055abcb0671a7cc814bb67d587bb9350d4c Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Tue, 19 Dec 2017 16:16:23 -0800 Subject: [PATCH 3/3] restore pin-urbit-relese.url --- .travis.yml | 4 ++-- .travis/pin-urbit-release.url | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 .travis/pin-urbit-release.url diff --git a/.travis.yml b/.travis.yml index ad3883422..4da03fd5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,8 @@ node_js: before_install: - cd .travis # keep main directory clear - - wget https://github.com/urbit/urbit/releases/download/v0.5.1/urbit_0.5-1_amd64.deb - - sudo apt install ./urbit_0.5-1_amd64.deb + - wget -i pin-urbit-release.url -O ./urbit.deb + - sudo apt install ./urbit.deb before_script: bash get-or-build-pill.sh diff --git a/.travis/pin-urbit-release.url b/.travis/pin-urbit-release.url new file mode 100644 index 000000000..560ece0e3 --- /dev/null +++ b/.travis/pin-urbit-release.url @@ -0,0 +1 @@ +https://github.com/urbit/urbit/releases/download/v0.5.1/urbit_0.5-1_amd64.deb