Skip to content

Commit

Permalink
Release candidate v2.1 (#300)
Browse files Browse the repository at this point in the history
  • Loading branch information
matthew-levan authored Mar 21, 2023
2 parents adec58d + dc10db0 commit 8379b52
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
7 changes: 6 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ Reference any related issues, links, papers, etc. here.
Tests will run automatically via GitHub Actions when you open a pull request or
push new commits to an existing pull request.

With current github permissions, a PR is merge-ready after a single approval
from any member of @urbit/runtime. Although anyone can hit the merge button,
defer to the PR author to merge unless it's an urgent hotfix that needs to be
merged ASAP.

Once you've collected and addressed feedback and are ready to merge, merge the
pull request. Use the default commit message which should default to your PR
title and description. Assuming that you properly included the "Resolves #N."
Expand Down Expand Up @@ -147,4 +152,4 @@ jump to definition, cross-references, hovering, symbol renaming, etc.):

```console
bazel run //bazel:refresh_compile_commands
```
```
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0
2.1
4 changes: 2 additions & 2 deletions WORKSPACE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,10 @@ versioned_http_archive(
versioned_http_archive(
name = "openssl",
build_file = "//bazel/third_party/openssl:openssl.BUILD",
sha256 = "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca",
sha256 = "8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b",
strip_prefix = "openssl-{version}",
url = "https://www.openssl.org/source/openssl-{version}.tar.gz",
version = "1.1.1q",
version = "1.1.1t",
)

versioned_http_archive(
Expand Down
4 changes: 2 additions & 2 deletions pkg/vere/pier.c
Original file line number Diff line number Diff line change
Expand Up @@ -676,8 +676,8 @@ _pier_wyrd_fail(u3_pier* pir_u, u3_ovum* egg_u, u3_noun lud)
// XX organizing version constants
//
#define VERE_NAME "vere"
#define VERE_ZUSE 415
#define VERE_LULL 326
#define VERE_ZUSE 414
#define VERE_LULL 325

/* _pier_wyrd_aver(): check for %wend effect and version downgrade. RETAIN
*/
Expand Down

0 comments on commit 8379b52

Please sign in to comment.