Skip to content

Commit

Permalink
Update for OpenRiak
Browse files Browse the repository at this point in the history
  • Loading branch information
martinsumner committed Sep 26, 2024
1 parent e8b86a7 commit e6b7f0f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 33 deletions.
24 changes: 6 additions & 18 deletions .github/workflows/erlang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ name: Erlang CI

on:
push:
branches: [ nhse-develop ]
branches:
- nhse-develop
pull_request:
branches: [ nhse-develop ]

branches:
- nhse-develop

jobs:

Expand All @@ -17,25 +18,12 @@ jobs:
strategy:
fail-fast: false
matrix:
otp: [22, 24, 25]
otp: [24]
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:
Expand Down
25 changes: 10 additions & 15 deletions rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,11 @@

{xref_checks,[undefined_function_calls,undefined_functions]}.

%% XXX yz_kv is here becase Ryan has not yet made a generic hook interface for object modification
%% XXX yz_stat is here for similar reasons -- we do not yet support dynamic stat hooks
%% XXX object is here because it's a new Lager sync
{xref_queries, [{"(XC - UC) || (XU - X - B - \"(cluster_info|dtrace|yz_kv|yz_stat|object)\" : Mod)", []}]}.

{erl_first_files, [
"src/riak_kv_backend.erl"
]}.

{plugins, [{rebar3_gpb_plugin, {git, "https://github.com/nhs-riak/rebar3_gpb_plugin", {tag, "nhse-develop"}}},
{plugins, [{rebar3_gpb_plugin, {git, "https://github.com/OpenRiak/rebar3_gpb_plugin", {tag, "nhse-develop"}}},
{eqc_rebar, {git, "https://github.com/Quviq/eqc-rebar", {branch, "master"}}}]}.

{gpb_opts, [{module_name_suffix, "_pb"},
Expand All @@ -42,16 +37,16 @@
]}.

{deps, [
{riak_core, {git, "https://github.com/nhs-riak/riak_core.git", {branch, "nhse-develop"}}},
{sidejob, {git, "https://github.com/nhs-riak/sidejob.git", {branch, "nhse-develop"}}},
{bitcask, {git, "https://github.com/nhs-riak/bitcask.git", {branch, "nhse-develop"}}},
{riak_core, {git, "https://github.com/OpenRiak/riak_core.git", {branch, "nhse-develop"}}},
{sidejob, {git, "https://github.com/OpenRiak/sidejob.git", {branch, "nhse-develop"}}},
{bitcask, {git, "https://github.com/OpenRiak/bitcask.git", {branch, "nhse-develop"}}},
{redbug, {git, "https://github.com/massemanet/redbug", {branch, "master"}}},
{recon, {git, "https://github.com/ferd/recon", {tag, "2.5.2"}}},
{sext, {git, "https://github.com/uwiger/sext.git", {tag, "1.8.0"}}},
{riak_pipe, {git, "https://github.com/nhs-riak/riak_pipe.git", {branch, "nhse-develop"}}},
{riak_dt, {git, "https://github.com/nhs-riak/riak_dt.git", {branch, "nhse-develop"}}},
{riak_api, {git, "https://github.com/nhs-riak/riak_api.git", {branch, "nhse-develop"}}},
{hyper, {git, "https://github.com/nhs-riak/hyper", {branch, "nhse-develop"}}},
{kv_index_tictactree, {git, "https://github.com/nhs-riak/kv_index_tictactree.git", {branch, "nhse-develop"}}},
{rhc, {git, "https://github.com/nhs-riak/riak-erlang-http-client", {branch, "nhse-develop"}}}
{riak_pipe, {git, "https://github.com/OpenRiak/riak_pipe.git", {branch, "nhse-develop"}}},
{riak_dt, {git, "https://github.com/OpenRiak/riak_dt.git", {branch, "nhse-develop"}}},
{riak_api, {git, "https://github.com/OpenRiak/riak_api.git", {branch, "nhse-develop"}}},
{hyper, {git, "https://github.com/OpenRiak/hyper", {branch, "nhse-develop"}}},
{kv_index_tictactree, {git, "https://github.com/OpenRiak/kv_index_tictactree.git", {branch, "nhse-develop"}}},
{rhc, {git, "https://github.com/OpenRiak/riak-erlang-http-client", {branch, "nhse-develop"}}}
]}.

0 comments on commit e6b7f0f

Please sign in to comment.