urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-22 10:21:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6726 from urbit/pkova/ci-fix

Browse Source 
ci: hopefully fix CI
This commit is contained in:
Pyry Kovanen 2023-07-18 18:53:50 +03:00 committed by GitHub
commit 00e3e663fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/shared.yml vendored
View File

@ -79,4 +79,4 @@ jobs:
- if: ${{ matrix.os == 'ubuntu-latest' }} - if: ${{ matrix.os == 'ubuntu-latest' }}
name: run urbit-tests name: run urbit-tests
run: | run: |
nix flake check --keep-build-log nix flake check --keep-build-log -L

22
nix/test-fake-ship.nix
View File

@ -35,7 +35,7 @@ let
${poke} ${poke}
=/ m (strand ,vase) =/ m (strand ,vase)
;< [=ship =desk =case] bind:m get-beak ;< [=ship =desk =case] bind:m get-beak
;< ok=? bind:m (poke [ship %dojo] %lens-command !>([%$ [%dojo '${dojoCommand}'] [%output-file 'result/noun']])) ;< ok=? bind:m (poke [ship %dojo] %lens-command !>([%$ [%dojo '${dojoCommand}'] [%stdout ~]]))
(pure:m !>(ok)) (pure:m !>(ok))
''; '';
}; };
@ -93,24 +93,20 @@ in pkgs.stdenvNoCC.mkDerivation {
${click} -k -p -i ${pokeApp "%generators" "noun" "test"} ./pier ${click} -k -p -i ${pokeApp "%generators" "noun" "test"} ./pier
${click} -k -p -i ${pokeApp "%marks" "noun" "test"} ./pier ${click} -k -p -i ${pokeApp "%marks" "noun" "test"} ./pier
# The rest of the commands fail for unknown reasons. ${click} -k -p -i ${appThread "mass" "hood"} ./pier
sleep 2
# ${click} -k -p -i ${appThread "mass" "hood"} ./pier ${click} -k -p -i ${pokeApp "~" "helm-pack" "hood"} ./pier
# sleep 2
# ${click} -k -p -i ${pokeApp "~" "helm-pack" "hood"} ./pier ${click} -k -p -i ${appThread "trim" "hood"} ./pier
# ${click} -k -p -i ${appThread "trim" "hood"} ./pier ${click} -k -p -i ${appThread "mass" "hood"} ./pier
# ${click} -k -p -i ${appThread "mass" "hood"} ./pier ${click} -k -p -i ${appThread "meld" "hood"} ./pier
# ${click} -k -p -i ${appThread "meld" "hood"} ./pier ${click} -k -p -i ${appThread "mass" "hood"} ./pier
# sleep 60 ${click} -k -p -i ${appThread "exit" "hood"} ./pier
# ${click} -k -p -i ${appThread "mass" "hood"} ./pier
# ${click} -k -p -i ${appThread "exit" "hood"} ./pier
set +x set +x
''; '';

5
pkg/base-dev/lib/strandio.hoon
View File

@ -581,8 +581,9 @@
++ check-for-file ++ check-for-file
|= [[=ship =desk =case] =spur] |= [[=ship =desk =case] =spur]
=/ m (strand ,?) =/ m (strand ,?)
;< =riot:clay bind:m (warp ship desk ~ %sing %x case spur) ;< =riot:clay bind:m (warp ship desk ~ %sing %u case spur)
(pure:m ?=(^ riot)) ?> ?=(^ riot)
(pure:m !<(? q.r.u.riot))
:: ::
++ list-tree ++ list-tree
|= [[=ship =desk =case] =spur] |= [[=ship =desk =case] =spur]