mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-09-19 06:28:52 +03:00
Merge branch 'master' into next/arvo
This commit is contained in:
commit
d384b01e7f
24
.github/workflows/frontend-test.yml
vendored
24
.github/workflows/frontend-test.yml
vendored
@ -1,24 +0,0 @@
|
|||||||
name: frontend-test
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
paths:
|
|
||||||
- 'pkg/interface/**'
|
|
||||||
- 'pkg/btc-wallet/**'
|
|
||||||
- 'pkg/npm/**'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
frontend-test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
name: "Test changed frontend packages"
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
- run: git fetch --prune
|
|
||||||
- name: 'Setup root deps'
|
|
||||||
run: npm ci
|
|
||||||
- name: 'Setup dependencies'
|
|
||||||
run: npm run bootstrap
|
|
||||||
- name: 'Run tests'
|
|
||||||
run: npm run test -- --since origin/$GITHUB_BASE_REF --include-dependents
|
|
79
.github/workflows/vere.yml
vendored
79
.github/workflows/vere.yml
vendored
@ -162,86 +162,9 @@ jobs:
|
|||||||
- if: ${{ matrix.os == 'ubuntu-latest' }}
|
- if: ${{ matrix.os == 'ubuntu-latest' }}
|
||||||
run: nix-build -A docker-image
|
run: nix-build -A docker-image
|
||||||
|
|
||||||
mingw:
|
|
||||||
runs-on: windows-latest
|
|
||||||
defaults:
|
|
||||||
run:
|
|
||||||
shell: >
|
|
||||||
C:\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -here -c
|
|
||||||
". <(cygpath '{0}')"
|
|
||||||
working-directory: ./pkg/urbit
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
lfs: true
|
|
||||||
|
|
||||||
# echo suppresses pacman prompt
|
|
||||||
- run: echo|./configure
|
|
||||||
env:
|
|
||||||
CACHIX_CACHE: ares
|
|
||||||
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
|
|
||||||
|
|
||||||
- run: mingw32-make build/urbit
|
|
||||||
- run: mingw32-make test
|
|
||||||
- run: >
|
|
||||||
build/urbit -l -d -B ../../bin/solid.pill -F bus &&
|
|
||||||
curl -f --data '{"source":{"dojo":"+hood/exit"},"sink":{"app":"hood"}}'
|
|
||||||
http://localhost:12321
|
|
||||||
|
|
||||||
- name: confirm binary is mostly static
|
|
||||||
run: |
|
|
||||||
if [ -z "$(ldd build/urbit | grep -vi "windows/system32")"]; then
|
|
||||||
echo "it's mostly static"
|
|
||||||
exit 0
|
|
||||||
else
|
|
||||||
echo "dynamic links found:"
|
|
||||||
ldd build/urbit
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- uses: actions/setup-python@v2
|
|
||||||
if: inputs.upload
|
|
||||||
with:
|
|
||||||
python-version: 3.7
|
|
||||||
|
|
||||||
- uses: google-github-actions/setup-gcloud@v0.6.0
|
|
||||||
if: inputs.upload
|
|
||||||
env:
|
|
||||||
# see https://github.com/google-github-actions/setup-gcloud/issues/100
|
|
||||||
CLOUDSDK_PYTHON: ${{env.pythonLocation}}\python.exe
|
|
||||||
with:
|
|
||||||
service_account_key: ${{ secrets.GCS_SERVICE_ACCOUNT_KEY }}
|
|
||||||
project_id: ${{ secrets.GCS_PROJECT }}
|
|
||||||
export_default_credentials: true
|
|
||||||
|
|
||||||
- name: upload binary to bootstrap.urbit.org
|
|
||||||
if: inputs.upload
|
|
||||||
env:
|
|
||||||
CLOUDSDK_PYTHON: ${{env.pythonLocation}}\python.exe
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
if [ "real" == "$VERSION_TYPE" ]; then
|
|
||||||
version="$(cat ./version)"
|
|
||||||
else
|
|
||||||
version="${GITHUB_SHA:0:9}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
system="x86_64-windows"
|
|
||||||
target="gs://${UPLOAD_BASE}/${VERE_PACE}/${version}/vere-v${version}-${system}.exe"
|
|
||||||
|
|
||||||
gsutil cp -n ./build/urbit.exe "$target"
|
|
||||||
exitcode=$?
|
|
||||||
|
|
||||||
test $exitcode -eq 0 &&
|
|
||||||
echo "upload to $target complete." ||
|
|
||||||
echo "upload to $target failed.";
|
|
||||||
exit $exitcode
|
|
||||||
|
|
||||||
|
|
||||||
after:
|
after:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: [urbit, mingw]
|
needs: [urbit]
|
||||||
if: inputs.upload
|
if: inputs.upload
|
||||||
steps:
|
steps:
|
||||||
- uses: google-github-actions/setup-gcloud@v0.2.0
|
- uses: google-github-actions/setup-gcloud@v0.2.0
|
||||||
|
@ -41,6 +41,7 @@
|
|||||||
state-one
|
state-one
|
||||||
state-two
|
state-two
|
||||||
state-three
|
state-three
|
||||||
|
state-four
|
||||||
==
|
==
|
||||||
::
|
::
|
||||||
+$ state-zero
|
+$ state-zero
|
||||||
@ -61,9 +62,15 @@
|
|||||||
=groups
|
=groups
|
||||||
wait=(set ship)
|
wait=(set ship)
|
||||||
==
|
==
|
||||||
|
::
|
||||||
|
+$ state-four
|
||||||
|
$: %4
|
||||||
|
=groups
|
||||||
|
wait=(set ship)
|
||||||
|
==
|
||||||
--
|
--
|
||||||
::
|
::
|
||||||
=| state-three
|
=| state-four
|
||||||
=* state -
|
=* state -
|
||||||
::
|
::
|
||||||
%- agent:dbug
|
%- agent:dbug
|
||||||
@ -84,7 +91,15 @@
|
|||||||
=| cards=(list card)
|
=| cards=(list card)
|
||||||
|^
|
|^
|
||||||
?- -.old
|
?- -.old
|
||||||
%3 [(flop cards) this(state old)]
|
%4 [(flop cards) this(state old)]
|
||||||
|
::
|
||||||
|
%3
|
||||||
|
%_ $
|
||||||
|
old [%4 +.old]
|
||||||
|
cards
|
||||||
|
:_ cards
|
||||||
|
[%pass /pyre/rebuild %agent [our dap]:bowl %poke noun+!>(%rebuild)]
|
||||||
|
==
|
||||||
::
|
::
|
||||||
%2
|
%2
|
||||||
%_ $
|
%_ $
|
||||||
@ -140,6 +155,7 @@
|
|||||||
?+ q.vase !!
|
?+ q.vase !!
|
||||||
%migrate poke-migrate:gc
|
%migrate poke-migrate:gc
|
||||||
%export poke-export:gc
|
%export poke-export:gc
|
||||||
|
%rebuild poke-rebuild:gc
|
||||||
==
|
==
|
||||||
::
|
::
|
||||||
?(%group-update-0 %group-action)
|
?(%group-update-0 %group-action)
|
||||||
@ -235,6 +251,42 @@
|
|||||||
::
|
::
|
||||||
|_ bol=bowl:gall
|
|_ bol=bowl:gall
|
||||||
+* io ~(. agentio bol)
|
+* io ~(. agentio bol)
|
||||||
|
++ poke-rebuild
|
||||||
|
^- (quip card _state)
|
||||||
|
|^
|
||||||
|
=. wait
|
||||||
|
put-missing
|
||||||
|
=^ cards state
|
||||||
|
rewatch
|
||||||
|
[cards state]
|
||||||
|
::
|
||||||
|
++ rewatch
|
||||||
|
=/ wait ~(tap in wait)
|
||||||
|
=| cards=(list card)
|
||||||
|
|-
|
||||||
|
?~ wait
|
||||||
|
[cards state]
|
||||||
|
=/ wir /gladio/(scot %p i.wait)
|
||||||
|
=. cards
|
||||||
|
:_(cards (watch-init-migrate i.wait))
|
||||||
|
:: if we have a subscription already, leave first to restart
|
||||||
|
=? cards
|
||||||
|
(~(has by wex.bol) [wir i.wait %groups])
|
||||||
|
:_(cards [%pass wir %agent [i.wait %groups] %leave ~])
|
||||||
|
$(wait t.wait)
|
||||||
|
::
|
||||||
|
++ put-missing
|
||||||
|
=/ wex ~(tap by wex.bol)
|
||||||
|
|-
|
||||||
|
?~ wex
|
||||||
|
wait
|
||||||
|
=/ [[=wire =ship =term] [acked=? =(pole knot)]]
|
||||||
|
i.wex
|
||||||
|
?. ?=([%gladio ship=@ ~] pole)
|
||||||
|
$(wex t.wex)
|
||||||
|
$(wex t.wex, wait (~(put in wait) (slav %p ship.pole)))
|
||||||
|
--
|
||||||
|
::
|
||||||
++ poke-export
|
++ poke-export
|
||||||
^- (quip card _state)
|
^- (quip card _state)
|
||||||
:_ state
|
:_ state
|
||||||
@ -351,8 +403,8 @@
|
|||||||
|= arc=*
|
|= arc=*
|
||||||
^- (quip card _state)
|
^- (quip card _state)
|
||||||
|^
|
|^
|
||||||
=/ sty=state-three
|
=/ sty=state-four
|
||||||
[%3 (remake-groups ;;((tree [resource tree-group]) +.arc)) ~]
|
[%4 (remake-groups ;;((tree [resource tree-group]) +.arc)) ~]
|
||||||
:_ sty
|
:_ sty
|
||||||
%+ roll ~(tap by groups.sty)
|
%+ roll ~(tap by groups.sty)
|
||||||
|= [[rid=resource grp=group] out=(list card)]
|
|= [[rid=resource grp=group] out=(list card)]
|
||||||
|
@ -9,12 +9,14 @@
|
|||||||
+$ card card:agent:gall
|
+$ card card:agent:gall
|
||||||
+$ versioned-state
|
+$ versioned-state
|
||||||
$% state-zero
|
$% state-zero
|
||||||
|
state-one
|
||||||
==
|
==
|
||||||
::
|
::
|
||||||
+$ state-zero [%0 =credentials =configuration]
|
+$ state-zero [%0 =credentials:zero:past =configuration:zero:past]
|
||||||
|
+$ state-one [%1 =credentials =configuration]
|
||||||
--
|
--
|
||||||
::
|
::
|
||||||
=| state-zero
|
=| state-one
|
||||||
=* state -
|
=* state -
|
||||||
::
|
::
|
||||||
%- agent:dbug
|
%- agent:dbug
|
||||||
@ -28,8 +30,28 @@
|
|||||||
++ on-init on-init:def
|
++ on-init on-init:def
|
||||||
++ on-save !>(state)
|
++ on-save !>(state)
|
||||||
++ on-load
|
++ on-load
|
||||||
|= old-vase=vase
|
|= =vase
|
||||||
[~ this(state !<(state-zero old-vase))]
|
=/ old !<(versioned-state vase)
|
||||||
|
|^
|
||||||
|
?- -.old
|
||||||
|
%1 `this(state old)
|
||||||
|
%0 `this(state (state-0-to-1 old))
|
||||||
|
==
|
||||||
|
++ state-0-to-1
|
||||||
|
|= zer=state-zero
|
||||||
|
^- state-one
|
||||||
|
:* %1
|
||||||
|
credentials.zer
|
||||||
|
(configuration-0-to-1 configuration.zer)
|
||||||
|
==
|
||||||
|
++ configuration-0-to-1
|
||||||
|
|= conf=configuration:zero:past
|
||||||
|
^- ^configuration
|
||||||
|
:* buckets.conf
|
||||||
|
current-bucket.conf
|
||||||
|
''
|
||||||
|
==
|
||||||
|
--
|
||||||
::
|
::
|
||||||
++ on-poke
|
++ on-poke
|
||||||
~/ %s3-poke
|
~/ %s3-poke
|
||||||
@ -56,6 +78,9 @@
|
|||||||
::
|
::
|
||||||
%set-secret-access-key
|
%set-secret-access-key
|
||||||
state(secret-access-key.credentials secret-access-key.act)
|
state(secret-access-key.credentials secret-access-key.act)
|
||||||
|
::
|
||||||
|
%set-region
|
||||||
|
state(region.configuration region.act)
|
||||||
::
|
::
|
||||||
%set-current-bucket
|
%set-current-bucket
|
||||||
%_ state
|
%_ state
|
||||||
|
10
pkg/landscape/gen/s3-store/set-region.hoon
Normal file
10
pkg/landscape/gen/s3-store/set-region.hoon
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
:: s3-store|set-current-bucket: set current bucket for S3
|
||||||
|
::
|
||||||
|
/- *s3
|
||||||
|
:- %say
|
||||||
|
|= $: [now=@da eny=@uvJ =beak]
|
||||||
|
[[region=@t ~] ~]
|
||||||
|
==
|
||||||
|
:- %s3-action
|
||||||
|
^- action
|
||||||
|
[%set-region region]
|
@ -10,6 +10,7 @@
|
|||||||
:~ [%set-endpoint so:dejs]
|
:~ [%set-endpoint so:dejs]
|
||||||
[%set-access-key-id so:dejs]
|
[%set-access-key-id so:dejs]
|
||||||
[%set-secret-access-key so:dejs]
|
[%set-secret-access-key so:dejs]
|
||||||
|
[%set-region so:dejs]
|
||||||
[%add-bucket so:dejs]
|
[%add-bucket so:dejs]
|
||||||
[%remove-bucket so:dejs]
|
[%remove-bucket so:dejs]
|
||||||
[%set-current-bucket so:dejs]
|
[%set-current-bucket so:dejs]
|
||||||
@ -25,6 +26,7 @@
|
|||||||
:~ ?- -.upd
|
:~ ?- -.upd
|
||||||
%set-current-bucket [%'setCurrentBucket' s+bucket.upd]
|
%set-current-bucket [%'setCurrentBucket' s+bucket.upd]
|
||||||
%add-bucket [%'addBucket' s+bucket.upd]
|
%add-bucket [%'addBucket' s+bucket.upd]
|
||||||
|
%set-region [%'setRegion' s+region.upd]
|
||||||
%remove-bucket [%'removeBucket' s+bucket.upd]
|
%remove-bucket [%'removeBucket' s+bucket.upd]
|
||||||
%set-endpoint [%'setEndpoint' s+endpoint.upd]
|
%set-endpoint [%'setEndpoint' s+endpoint.upd]
|
||||||
%set-access-key-id [%'setAccessKeyId' s+access-key-id.upd]
|
%set-access-key-id [%'setAccessKeyId' s+access-key-id.upd]
|
||||||
@ -44,6 +46,7 @@
|
|||||||
%- pairs:enjs
|
%- pairs:enjs
|
||||||
:~ [%buckets a+(turn ~(tap in buckets.configuration.upd) |=(a=@t s+a))]
|
:~ [%buckets a+(turn ~(tap in buckets.configuration.upd) |=(a=@t s+a))]
|
||||||
[%'currentBucket' s+current-bucket.configuration.upd]
|
[%'currentBucket' s+current-bucket.configuration.upd]
|
||||||
|
[%'region' s+region.configuration.upd]
|
||||||
==
|
==
|
||||||
==
|
==
|
||||||
==
|
==
|
||||||
|
27
pkg/landscape/sur/s3-0.hoon
Normal file
27
pkg/landscape/sur/s3-0.hoon
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
|%
|
||||||
|
+$ credentials
|
||||||
|
$: endpoint=@t
|
||||||
|
access-key-id=@t
|
||||||
|
secret-access-key=@t
|
||||||
|
==
|
||||||
|
::
|
||||||
|
+$ configuration
|
||||||
|
$: buckets=(set @t)
|
||||||
|
current-bucket=@t
|
||||||
|
==
|
||||||
|
::
|
||||||
|
+$ action
|
||||||
|
$% [%set-endpoint endpoint=@t]
|
||||||
|
[%set-access-key-id access-key-id=@t]
|
||||||
|
[%set-secret-access-key secret-access-key=@t]
|
||||||
|
[%add-bucket bucket=@t]
|
||||||
|
[%remove-bucket bucket=@t]
|
||||||
|
[%set-current-bucket bucket=@t]
|
||||||
|
==
|
||||||
|
::
|
||||||
|
+$ update
|
||||||
|
$% [%credentials =credentials]
|
||||||
|
[%configuration =configuration]
|
||||||
|
action
|
||||||
|
==
|
||||||
|
--
|
@ -1,4 +1,9 @@
|
|||||||
|
/- zer=s3-0
|
||||||
|%
|
|%
|
||||||
|
++ past
|
||||||
|
|%
|
||||||
|
++ zero zer
|
||||||
|
--
|
||||||
+$ credentials
|
+$ credentials
|
||||||
$: endpoint=@t
|
$: endpoint=@t
|
||||||
access-key-id=@t
|
access-key-id=@t
|
||||||
@ -8,6 +13,7 @@
|
|||||||
+$ configuration
|
+$ configuration
|
||||||
$: buckets=(set @t)
|
$: buckets=(set @t)
|
||||||
current-bucket=@t
|
current-bucket=@t
|
||||||
|
region=@t
|
||||||
==
|
==
|
||||||
::
|
::
|
||||||
+$ action
|
+$ action
|
||||||
@ -17,6 +23,7 @@
|
|||||||
[%add-bucket bucket=@t]
|
[%add-bucket bucket=@t]
|
||||||
[%remove-bucket bucket=@t]
|
[%remove-bucket bucket=@t]
|
||||||
[%set-current-bucket bucket=@t]
|
[%set-current-bucket bucket=@t]
|
||||||
|
[%set-region region=@t]
|
||||||
==
|
==
|
||||||
::
|
::
|
||||||
+$ update
|
+$ update
|
||||||
|
Loading…
Reference in New Issue
Block a user