From a55ca707952822b5214f5c2e573a38c4ef3d748b Mon Sep 17 00:00:00 2001
From: Martin Sumner <martin.sumner@adaptip.co.uk>
Date: Tue, 24 Sep 2024 13:40:30 +0100
Subject: [PATCH] Update to OpenRiak

---
 .github/workflows/erlang.yml | 28 ++++++++++------------------
 rebar.config                 | 16 ++++++++--------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
index 037271a9a..17991f97a 100644
--- a/.github/workflows/erlang.yml
+++ b/.github/workflows/erlang.yml
@@ -2,10 +2,15 @@ name: Erlang CI
 
 on:
   push:
-    branches: [ nhse-develop ]
+    branches:
+      - nhse-develop
+      - nhse-develop-3.2
+      - nhse-develop-3.4
   pull_request:
-    branches: [ nhse-develop ]
-
+    branches:
+      - nhse-develop
+      - nhse-develop-3.2
+      - nhse-develop-3.4
 
 jobs:
 
@@ -17,25 +22,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        otp: [22, 24, 25]
+        otp: [24, 26]
         os: [ubuntu-latest]
-        # OTP lower than 23 does not run on ubuntu-latest (22.04), see
-        # https://github.com/erlef/setup-beam#compatibility-between-operating-system-and-erlangotp
-        exclude:
-          - otp: 22
-            os: ubuntu-latest
-        include:
-          - otp: 22
-            os: ubuntu-20.04
 
     steps:
       - uses: lukka/get-cmake@latest
-      - uses: actions/checkout@v2
-      - name: Install dependencies (Ubuntu)
-        if: ${{ startsWith(matrix.os, 'ubuntu') }}
-        run: |
-          sudo apt-get -qq update
-          sudo apt-get -qq install libsnappy-dev libc6-dev
+      - uses: actions/checkout@v4
       - name: Install Erlang/OTP
         uses: erlef/setup-beam@v1
         with:
diff --git a/rebar.config b/rebar.config
index 8c43a6981..cbb1ae80a 100644
--- a/rebar.config
+++ b/rebar.config
@@ -16,15 +16,15 @@
 {plugins, [{eqc_rebar, {git, "https://github.com/Quviq/eqc-rebar", {branch, "master"}}}]}.
 
 {deps, [
-  {poolboy, {git, "https://github.com/nhs-riak/poolboy.git", {branch, "nhse-develop-3.2"}}},
-  {riak_sysmon, {git, "https://github.com/nhs-riak/riak_sysmon.git", {branch, "nhse-develop"}}},
-  {clique, {git, "https://github.com/nhs-riak/clique.git", {branch, "nhse-develop"}}},
-  {eleveldb, {git, "https://github.com/nhs-riak/eleveldb.git", {branch, "nhse-develop-3.2"}}},
-  {riak_ensemble, {git, "https://github.com/nhs-riak/riak_ensemble", {branch, "nhse-develop"}}},
-  {pbkdf2, {git, "https://github.com/nhs-riak/erlang-pbkdf2.git", {branch, "nhse-develop"}}},
-  {cluster_info, {git, "https://github.com/nhs-riak/cluster_info.git", {branch, "nhse-develop"}}},
+  {poolboy, {git, "https://github.com/OpenRiak/poolboy.git", {branch, "nhse-develop-3.2"}}},
+  {riak_sysmon, {git, "https://github.com/OpenRiak/riak_sysmon.git", {branch, "nhse-develop"}}},
+  {clique, {git, "https://github.com/OpenRiak/clique.git", {branch, "nhse-develop"}}},
+  {eleveldb, {git, "https://github.com/OpenRiak/eleveldb.git", {branch, "nhse-develop-3.2"}}},
+  {riak_ensemble, {git, "https://github.com/OpenRiak/riak_ensemble", {branch, "nhse-develop-3.2"}}},
+  {pbkdf2, {git, "https://github.com/OpenRiak/erlang-pbkdf2.git", {branch, "nhse-develop"}}},
+  {cluster_info, {git, "https://github.com/OpenRiak/cluster_info.git", {branch, "nhse-develop"}}},
   {exometer_core, {git, "https://github.com/Feuerlabs/exometer_core.git", {tag, "1.6.1"}}},
-  {basho_stats, {git, "https://github.com/nhs-riak/basho_stats.git", {branch, "nhse-develop"}}}
+  {basho_stats, {git, "https://github.com/OpenRiak/basho_stats.git", {branch, "nhse-develop"}}}
 ]}.
 
 {dialyzer, [{plt_apps, all_deps}]}.