From d50b9fd2737972eb2620db6877586e2674c94ac5 Mon Sep 17 00:00:00 2001 From: Matthew LeVan Date: Tue, 14 Mar 2023 13:38:42 -0400 Subject: [PATCH 1/4] pier: decrement zuse/lull --- 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 275e83f055..88a0a19ea0 100644 --- a/pkg/vere/pier.c +++ b/pkg/vere/pier.c @@ -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 */ From b34c81fc8661105f17cf31054a07821d56cda3c8 Mon Sep 17 00:00:00 2001 From: barter-simsum Date: Tue, 14 Mar 2023 13:15:42 -0400 Subject: [PATCH 2/4] CONTRIBUTING.md: no one other than PR authors should merge generally --- CONTRIBUTING.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0cc08c387d..96d1076c88 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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." @@ -147,4 +152,4 @@ jump to definition, cross-references, hovering, symbol renaming, etc.): ```console bazel run //bazel:refresh_compile_commands -``` \ No newline at end of file +``` From d251e202985c175493e163492a2f4f7107806034 Mon Sep 17 00:00:00 2001 From: J Lynn Date: Fri, 17 Mar 2023 06:43:46 +1100 Subject: [PATCH 3/4] OpenSSL: Update from 1.1.1q to 1.1.1t Resolves #287 --- WORKSPACE.bazel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index d9c53cdefa..2f48923edc 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -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( From 1d0664a69bf85f5b3928d9010bdc84453e4127d3 Mon Sep 17 00:00:00 2001 From: Matthew LeVan Date: Tue, 21 Mar 2023 13:59:29 -0400 Subject: [PATCH 4/4] bump version to v2.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index cd5ac039d6..879b416e60 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0 +2.1