Merge pull request #1225 from urbit/bump-arvo

bumps arvo commit to next, fixes pill staging
This commit is contained in:
Joe Bryan 2019-04-02 14:46:12 -07:00 committed by GitHub
commit d822391565
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 25 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eb04cfc9a02f56a5d844dc3cb2959dfebf43387280563434f977b78627a23398
size 5057757
oid sha256:f09c7cd2baeeb9e8b0f08cd43b38849ae7054274463b3a240b2af3e4063dece8
size 5202334

View File

@ -42,7 +42,8 @@ urb ./ship -p test -d ':- %renders /'
urb ./ship -d '~& %finish-test-renders ~'
# Run the test generator
urb ./ship -d '+test' | tee test-generator-output
urb ./ship -d '+test, =seed `@uvI`(shaz %reproducible)' |
tee test-generator-output
shutdown

@ -1 +1 @@
Subproject commit 7542084ee74c18f1d477c7b3b359582a95810864
Subproject commit 59dd8539262e93c46221f02db5098803504e4af0

4
pkg/urbit/configure vendored
View File

@ -2,7 +2,7 @@
set -e
URBIT_VERSION=0.7.0
URBIT_VERSION=0.8.0
deps=" \
curl gmp sigsegv argon2 ed25519 ent h2o scrypt sni uv murmur3 secp256k1 \
@ -15,7 +15,7 @@ defmacro () {
echo "#define $1 $2" >>include/config.h
}
defmacro URBIT_VERSION '"0.7.0"'
defmacro URBIT_VERSION "\"$URBIT_VERSION\""
[ -n "$MEMORY_DEBUG" ] && defmacro U3_MEMORY_DEBUG 1
[ -n "$CPU_DEBUG" ] && defmacro U3_CPU_DEBUG 1

View File

@ -6,14 +6,15 @@
static u3_noun
_turn_in(u3j_site* sit_u, u3_noun a)
{
if ( u3_nul == a ) {
return u3_nul;
}
else {
return u3nc(
u3j_gate_slam(sit_u, u3k(u3h(a))),
_turn_in(sit_u, u3t(a)));
u3_noun b = u3_nul;
while ( u3_nul != a ) {
b = u3nc(u3j_gate_slam(sit_u, u3k(u3h(a))),
b);
a = u3t(a);
}
return u3kb_flop(b);
}
/* functions

View File

@ -10,15 +10,19 @@
u3qb_weld(u3_noun a,
u3_noun b)
{
if ( 0 == a ) {
return u3k(b);
}
else if ( c3n == u3du(a) ) {
return u3m_bail(c3__exit);
}
else {
return u3nc(u3k(u3h(a)), u3qb_weld(u3t(a), b));
u3_noun c = u3qb_flop(a);
u3_noun d = c;
u3k(b);
while ( u3_nul != c ) {
b = u3nc(u3k(u3h(c)), b);
c = u3t(c);
}
u3z(d);
return b;
}
u3_noun
u3wb_weld(u3_noun cor)

View File

@ -1104,10 +1104,6 @@ _pier_boot_vent(u3_pier* pir_u)
u3_ames_ef_bake(pir_u);
u3a_lop(cod_l);
cod_l = u3a_lush(c3__behn);
u3_behn_ef_bake(pir_u);
u3a_lop(cod_l);
}
// insert legacy boot event