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

Merge pull request #5824 from urbit/jb/fix-remote-pr

Browse Source 
vere: fix ci for remote PRs
This commit is contained in:
Joe Bryan 2022-06-03 20:02:24 -04:00 committed by GitHub
commit 0e14cf893f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/vere.yml vendored
View File

@ -16,11 +16,11 @@ on:
required: false
secrets:
CACHIX_AUTH_TOKEN:
required: true
required: false
GCS_SERVICE_ACCOUNT_KEY:
required: true
required: false
GCS_PROJECT:
required: true
required: false
workflow_dispatch:
inputs:

4
Makefile
View File

@ -1,10 +1,10 @@
.PHONY: build build-all install cross release test pills ropsten-pills clean
build:
nix-build -A urbit -A herb --no-out-link
nix-build -A urbit --no-out-link
install:
nix-env -f . -iA urbit -iA herb
nix-env -f . -iA urbit
release:
sh/release

3
pkg/urbit/daemon/main.c
View File

@ -251,7 +251,7 @@ _main_getopt(c3_i argc, c3_c** argv)
break;
}
case 'Y': {
u3_Host.ops_u.puk_c = _main_repath(optarg);
u3_Host.ops_u.puk_c = strdup(optarg);
break;
}
case 'Z': {
@ -681,6 +681,7 @@ u3_ve_usage(c3_i argc, c3_c** argv)
"-Y, --scry-into FILE Optional name of file (for -X)\n",
"-Z, --scry-format FORMAT Optional file format ('jam', or aura, for -X)\n",
" --no-conn Do not run control plane\n",
" --no-dock Skip binary \"docking\" on boot\n",
"\n",
"Development Usage:\n",
" To create a development ship, use a fakezod:\n",

2
shell.nix
View File

@ -22,7 +22,7 @@ let
#
# Typically the inputs listed here also have a shell.nix in their respective
# source directory you can use directly.
inputsFrom = with pkgsLocal; [ ent herb urbit urcrypt ];
inputsFrom = with pkgsLocal; [ ent urbit urcrypt ];
# Collect the named attribute from all dependencies listed in inputsFrom.
mergeFrom = name: pkgs.lib.concatLists (pkgs.lib.catAttrs name inputsFrom);