From 3e3a1af9280510e1a7990010aee7c5047d48c92b Mon Sep 17 00:00:00 2001 From: Peter McEvoy Date: Wed, 18 Jan 2023 15:01:54 -0500 Subject: [PATCH 1/8] Add pill URL details to install instructions --- INSTALL.md | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index 3ca238e117..c42f3313db 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -97,9 +97,38 @@ $ bazel build :urbit For more information on Bazel configuration files, consult the [Bazel docs][bazel-config]. +## Run Commands + +Once the binary is built, you can run it with: + +```console +$ bazel run :urbit -- +``` + +Or, if that's too many characters to type, create a symlink to the `urbit` +binary in the root of the repo: + +```console +$ ln -s bazel-bin/pkg/vere/urbit urbit +$ ./urbit +``` + ## Common Issues -If `bazel build` or `bazel test` generates an `undeclared inclusion(s) in rule` +- When attempting to boot a ship using an `urbit` binary compiled from source + with a specified pace (release channel) of `once`, `edge`, or `soon` (i.e. not + `live`), the default pill URL of + https://bootstrap.urbit.org/urbit-v{version}.pill--where `{version}` is + something like `1.17`--will not work because the version string for non-`live` + release channels is `v{version}-{shortened commit SHA}`. To get around this, + either supply your own pill via `-B`/`--bootstrap` or specify the pill URL via + `-u`/`--bootstrap-url`: +```console +$ ./urbit -F zod -B path/to/pill +$ ./urbit -F bus -u https://bootstrap.urbit.org/urbit-v{version}.pill +``` + +- If `bazel build` or `bazel test` generates an `undeclared inclusion(s) in rule` error on macOS, the version of `clang` expected by the build system likely doesn't match the version of `clang` installed on your system. To address this, run `clang --version` and pass the version number via From f0b4cd21e16e4a751a7695571faec968164f6af3 Mon Sep 17 00:00:00 2001 From: Peter McEvoy Date: Fri, 20 Jan 2023 15:19:55 -0500 Subject: [PATCH 2/8] Remove commit SHA from version when constructing pill URL --- pkg/vere/main.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkg/vere/main.c b/pkg/vere/main.c index 9a539dec66..26887a1693 100644 --- a/pkg/vere/main.c +++ b/pkg/vere/main.c @@ -531,8 +531,23 @@ _main_getopt(c3_i argc, c3_c** argv) else if ( u3_Host.ops_u.nuu == c3y && u3_Host.ops_u.url_c == 0 && u3_Host.ops_u.git == c3n ) { - u3_Host.ops_u.url_c = - "https://bootstrap.urbit.org/urbit-v" URBIT_VERSION ".pill"; + + c3_c version_c[strlen(URBIT_VERSION) + 1]; + strcpy(version_c, URBIT_VERSION); + c3_c* hyphen_c = strchr(version_c, '-'); + // URBIT_VERSION has the form {version}-{commit_sha} when built on + // non-"live" channels, which means we need to strip off the trailing commit + // SHA in those cases. + if ( hyphen_c ) { + *hyphen_c = '\0'; + } + c3_i res_i = asprintf(&u3_Host.ops_u.url_c, + "https://bootstrap.urbit.org/urbit-v%s.pill", + version_c); + if ( res_i < 0 ) { + fprintf(stderr, "failed to construct pill URL\n"); + return c3n; + } } else if ( u3_Host.ops_u.nuu == c3y && u3_Host.ops_u.url_c == 0 From 5e455324ac0a96fc99521b7cf38d3916743afc90 Mon Sep 17 00:00:00 2001 From: Peter McEvoy Date: Fri, 20 Jan 2023 15:22:20 -0500 Subject: [PATCH 3/8] Revert "Add pill URL details to install instructions" This reverts commit 902dbf3447bf49865e8239b4306d1b185db9c20d. --- INSTALL.md | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index c42f3313db..3ca238e117 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -97,38 +97,9 @@ $ bazel build :urbit For more information on Bazel configuration files, consult the [Bazel docs][bazel-config]. -## Run Commands - -Once the binary is built, you can run it with: - -```console -$ bazel run :urbit -- -``` - -Or, if that's too many characters to type, create a symlink to the `urbit` -binary in the root of the repo: - -```console -$ ln -s bazel-bin/pkg/vere/urbit urbit -$ ./urbit -``` - ## Common Issues -- When attempting to boot a ship using an `urbit` binary compiled from source - with a specified pace (release channel) of `once`, `edge`, or `soon` (i.e. not - `live`), the default pill URL of - https://bootstrap.urbit.org/urbit-v{version}.pill--where `{version}` is - something like `1.17`--will not work because the version string for non-`live` - release channels is `v{version}-{shortened commit SHA}`. To get around this, - either supply your own pill via `-B`/`--bootstrap` or specify the pill URL via - `-u`/`--bootstrap-url`: -```console -$ ./urbit -F zod -B path/to/pill -$ ./urbit -F bus -u https://bootstrap.urbit.org/urbit-v{version}.pill -``` - -- If `bazel build` or `bazel test` generates an `undeclared inclusion(s) in rule` +If `bazel build` or `bazel test` generates an `undeclared inclusion(s) in rule` error on macOS, the version of `clang` expected by the build system likely doesn't match the version of `clang` installed on your system. To address this, run `clang --version` and pass the version number via From b1b8995edea7147c607eccad8d5c93fd31bdfd28 Mon Sep 17 00:00:00 2001 From: pkova Date: Fri, 20 Jan 2023 19:19:36 +0200 Subject: [PATCH 4/8] build: fix broken import for macos-x86_64 --- pkg/ent/ent.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/ent/ent.c b/pkg/ent/ent.c index e7309ff339..0375774a28 100644 --- a/pkg/ent/ent.c +++ b/pkg/ent/ent.c @@ -12,6 +12,8 @@ int ent_getentropy(void* buf, size_t len) { #elif defined(ENT_GETENTROPY_SYSRANDOM) #include +// See https://www.mail-archive.com/bug-gnulib@gnu.org/msg38583.html. +#include #include int ent_getentropy(void* buf, size_t len) { return getentropy(buf, len); From 563e9f312d001d7a03439e931fdc7a5fe2edc78d Mon Sep 17 00:00:00 2001 From: Philip Monk Date: Mon, 13 Feb 2023 13:51:26 -0700 Subject: [PATCH 5/8] fix -Y filename Fixes #222 --- pkg/vere/pier.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/vere/pier.c b/pkg/vere/pier.c index 41e7a257da..889b6723cb 100644 --- a/pkg/vere/pier.c +++ b/pkg/vere/pier.c @@ -487,7 +487,7 @@ _pier_on_scry_done(void* ptr_v, u3_noun nun) pac_c = u3_Host.ops_u.puk_c; } else { - pac_c = u3_Host.ops_u.pek_c; + pac_c = u3_Host.ops_u.pek_c + 1; } // try to serialize as requested @@ -517,7 +517,7 @@ _pier_on_scry_done(void* ptr_v, u3_noun nun) // if ( u3_none != out ) { c3_c fil_c[256]; - snprintf(fil_c, 256, "%s.%s", pac_c + 1, ext_c); + snprintf(fil_c, 256, "%s.%s", pac_c, ext_c); u3_unix_save(fil_c, out); u3l_log("pier: scry result in %s/.urb/put/%s", u3_Host.dir_c, fil_c); From c59ea0ddf402c38b9d7d578feee21c6c6bc57b8a Mon Sep 17 00:00:00 2001 From: Matthew LeVan Date: Tue, 21 Feb 2023 12:30:06 -0500 Subject: [PATCH 6/8] CI: add `GH_TOKEN` --- .github/workflows/shared.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml index c9ec96b969..b5e266380d 100644 --- a/.github/workflows/shared.yml +++ b/.github/workflows/shared.yml @@ -35,6 +35,7 @@ on: env: UPLOAD_BASE: bootstrap.urbit.org/vere + GH_TOKEN: ${{ github.token }} jobs: urbit: From 37726e67f5af0944a738a8bbe5e0744838be0457 Mon Sep 17 00:00:00 2001 From: barter-simsum Date: Tue, 21 Feb 2023 13:22:54 -0500 Subject: [PATCH 7/8] Revert "Automatically create GH releases (and corresponding tags) (#136)" This reverts commit dff7b44ee57dc57dc5451a09951be12ae45da1fa, reversing changes made to 1d31ad909c34ef4f666c4ac92a5527f8bbdafe2a. --- .RELEASE_DESCRIPTION.md | 0 .github/workflows/master.yml | 1 - .github/workflows/shared.yml | 27 +-------------------------- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 .RELEASE_DESCRIPTION.md diff --git a/.RELEASE_DESCRIPTION.md b/.RELEASE_DESCRIPTION.md deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index ef265f8011..641d30abe5 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -22,5 +22,4 @@ jobs: pace: 'live' upload: true fake_tests: false - release: true secrets: inherit diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml index b5e266380d..006ea7d0c1 100644 --- a/.github/workflows/shared.yml +++ b/.github/workflows/shared.yml @@ -22,10 +22,6 @@ on: description: 'Run fake ship tests' type: boolean default: true - release: - description: 'Create a GitHub release' - type: boolean - default: false required: false secrets: GCP_CREDENTIALS: @@ -177,28 +173,7 @@ jobs: echo "upload to $target complete." || echo "upload to $target failed."; exit $exitcode - - - name: Create a GitHub release - if: ${{ inputs.release }} - run: | - # Create or update the GitHub release. - # Compress and upload binary assets to release. - version="vere-v$(cat ./VERSION)" - exists=$(gh release list | cut -f 1 | grep -c "$version") - if [[ $exists -eq 0 ]]; then - # Create a new tag. - git tag $version - git push origin --tags - # Create a draft release with automatically-generated notes and - # source code archives. - gh release create $version \ - --draft \ - --generate-notes - fi - # Upload the binary to the release. - chmod +x ${{ env.urbit_static }} - tar -czf ${{ matrix.target }}.tgz ${{ env.urbit_static }} - gh release upload $version ${{ matrix.target }}.tgz + # # DOCKER From 8f46e1672c5b853e306d37b52ea04dc6f2858b62 Mon Sep 17 00:00:00 2001 From: Matthew LeVan Date: Tue, 21 Feb 2023 14:32:41 -0500 Subject: [PATCH 8/8] Revert "restore correct `VERSION`" This reverts commit 31ec04083c38d9c66d99ec9cd1873e119f3cbc35. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index d2ab029d32..71f7f51df9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.21 +1.22