Merge develop v1.22 into release (#252)

.github/workflows/master.yml

@@ -22,5 +22,4 @@ jobs:
       pace: 'live'
       upload: true
       fake_tests: false
-      release: true
     secrets: inherit

.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:
@@ -35,6 +31,7 @@ on:
 
 env:
   UPLOAD_BASE: bootstrap.urbit.org/vere
+  GH_TOKEN: ${{ github.token }}
 
 jobs:
   urbit:
@@ -176,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

VERSION

@@ -1 +1 @@
-1.21
+1.22

pkg/ent/ent.c

@@ -12,6 +12,8 @@ int ent_getentropy(void* buf, size_t len) {
 
 #elif defined(ENT_GETENTROPY_SYSRANDOM)
 #include <stddef.h>
+// See https://www.mail-archive.com/bug-gnulib@gnu.org/msg38583.html.
+#include <stdlib.h>
 #include <sys/random.h>
 int ent_getentropy(void* buf, size_t len) {
   return getentropy(buf, len);

pkg/vere/main.c

@@ -530,8 +530,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

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);