From a76f8eb7b1465b078a6d5d04762a6266619381c1 Mon Sep 17 00:00:00 2001 From: Martin Sumner Date: Thu, 24 Oct 2024 15:19:38 +0100 Subject: [PATCH] Update for OpenRiak & OTP26 --- .github/workflows/erlang.yml | 8 ++------ README.md | 4 ++-- rebar.config | 8 ++++---- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml index 17991f9..9bb992f 100644 --- a/.github/workflows/erlang.yml +++ b/.github/workflows/erlang.yml @@ -3,14 +3,10 @@ name: Erlang CI on: push: branches: - - nhse-develop - - nhse-develop-3.2 - - nhse-develop-3.4 + - openriak-3.4 pull_request: branches: - - nhse-develop - - nhse-develop-3.2 - - nhse-develop-3.4 + - openriak-3.4 jobs: diff --git a/README.md b/README.md index 8c55508..aa0adc1 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # `riak_api` - Riak Client APIs +![Riak API OpenRiak Status](https://github.com/OpenRiak/riak_api/actions/workflows/erlang.yml/badge.svg?branch=openriak-3.4) + This OTP application encapsulates services for presenting Riak's public-facing interfaces. Currently this means a generic interface for exposing Protocol Buffers-based services; HTTP services via Webmachine will be moved here at a later time. -[![Erlang CI Actions Status](https://github.com/basho/riak_api/workflows/Erlang%20CI/badge.svg)](https://github.com/basho/riak_api/actions) - ## Contributing We encourage contributions to `riak_api` from the community. diff --git a/rebar.config b/rebar.config index a95ce7a..915edcf 100644 --- a/rebar.config +++ b/rebar.config @@ -9,10 +9,10 @@ {eunit_opts, [verbose]}. {deps, [ - {riak_pb, {git, "https://github.com/OpenRiak/riak_pb.git", {branch, "nhse-develop"}}}, - {webmachine, {git, "https://github.com/webmachine/webmachine.git", {branch, "main"}}}, - {mochiweb, {git, "https://github.com/OpenRiak/mochiweb.git", {branch, "nhse-develop-3.4"}}}, - {riak_core, {git, "https://github.com/OpenRiak/riak_core.git", {branch, "nhse-develop-3.4"}}} + {riak_pb, {git, "https://github.com/OpenRiak/riak_pb.git", {branch, "openriak-3.4"}}}, + {webmachine, {git, "https://github.com/OpenRiak/webmachine.git", {branch, "openriak-3.4"}}}, + {mochiweb, {git, "https://github.com/OpenRiak/mochiweb.git", {branch, "openriak-3.4"}}}, + {riak_core, {git, "https://github.com/OpenRiak/riak_core.git", {branch, "openriak-3.4"}}} ]}. {profiles, [