Merge pull request #22 from nhs-riak/nhse-d34-wdaymerge

Nhse d34 wdaymerge

.github/workflows/erlang.yml

@@ -0,0 +1,34 @@
+name: Erlang CI
+
+on:
+  push:
+    branches:
+      - nhse-develop-3.4
+  pull_request:
+    branches:
+      - nhse-develop-3.4
+
+jobs:
+
+  build:
+
+    name: Test on ${{ matrix.os }} with OTP ${{ matrix.otp }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        otp: [24, 26]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: lukka/get-cmake@latest
+      - uses: actions/checkout@v4
+      - name: Install Erlang/OTP
+        uses: erlef/setup-beam@v1
+        with:
+          otp-version: ${{ matrix.otp }}
+      - name: Compile
+        run: make all
+      - name: Run dialyzer
+        run: ./rebar3 as check do dialyzer

.gitignore

@@ -1,25 +1,67 @@
-ebin
-log
-riak_test
-smoke_test
-.eunit
-.DS_Store
-out
-search-corpus/spam.0
-erl_crash.dump
-*~
-#*#
-*.jar
-coverage
-tags
-riak-*
-*.png
+# ===== Common Erlang Tools =====
+*.coverdata
+*.crashdump
+*.eqc
+*.log
+*_plt
+.cache/
+.eqc
+.eqc-info
+.erlang.cookie
+.erlang.mk
+.eunit/
+.pulse/
+.qc/
 .rebar/
-.local_dialyzer_plt
-dialyzer_unhandled_warnings
-dialyzer_warnings
-.idea
-riak_test.iml
+.rebar3/
 _build/
+_checkouts/
+_deps/
+_test/
+deps/
+ebin/
+log/
+logs/
+
+# ===== Common Development Tools =====
+*.bak
+*.dump
+*.iml
+*.orig
+*.plt
+*.sublime-project
+*.sublime-workspace
+*.swo
+*.swp
+*.tmp
+*~
+.DS_Store
+.concrete/
+.idea/
+.project
+.settings/
+.tm_properties
+.vscode/
+/*.txt
+erln8.config
+tags
+tmp/
+perf/*.beam
+*/group_tests/*
+*/results/*
 rebar.lock
-*.beam
+
+# ===== Project-specific Elements =====
+
+*.jar
+*.png
+/doc/*
+/riak
+/riak-test-manifest.mf
+/riak_test
+/search-corpus/spam.0
+
+# ===== Order matters - exclusion overrides last =====
+
+!/doc/*.edoc
+!/doc/*.md

Makefile

@@ -1,42 +1,53 @@
-HEAD_REVISION   ?= $(shell git describe --tags --exact-match HEAD 2>/dev/null)
-
-.PHONY: deps
-
-APPS = kernel stdlib sasl erts ssl tools os_mon runtime_tools crypto inets \
-	xmerl webtool eunit syntax_tools compiler hipe mnesia public_key \
-	observer wx gs
-PLT = $(HOME)/.riak-test_dialyzer_plt
-
-REBAR=./rebar3
-
-all: deps compile
-	$(REBAR) as test compile
-	$(REBAR) escriptize
-	mkdir -p ./ebin
-	cp ./_build/test/lib/riak_test/tests/*.beam ./ebin
-
-deps:
-	$(if $(HEAD_REVISION),$(warning "Warning: you have checked out a tag ($(HEAD_REVISION)) and should use the locked-deps target"))
-	$(REBAR) get-deps
+# -------------------------------------------------------------------
+#
+# Copyright (c) 2012-2016 Basho Technologies, Inc.
+# Copyright (c) 2017-2023 Workday, Inc.
+#
+# This file is provided to you under the Apache License,
+# Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License.  You may obtain
+# a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# -------------------------------------------------------------------
+#
+# Mostly just a façade over rebar3 from the command line.
+#
+
+REBAR ?= ./rebar3
+
+all: escript
+
+docs:
+	$(REBAR) edoc
 
 docsclean:
-	@rm -rf doc/*.png doc/*.html doc/*.css edoc-info
+	@$(RM) -rf doc/*.png doc/*.html doc/*.css edoc-info
+
+escript:
+	$(REBAR) as prod compile
 
-compile: deps
+compile:
 	$(REBAR) compile
 
 clean:
-	@$(REBAR) clean
+	$(REBAR) clean
 
 distclean: clean
-	@rm -rf riak_test deps
+	$(RM) -rf riak_test _build
 
-quickbuild:
-	$(REBAR) compile
-	$(REBAR) escriptize
+quickbuild: compile
 
-##################
-# Dialyzer targets
-##################
+xref:
+	$(REBAR) as check xref
 
-# include tools.mk
+dialyzer:
+	$(REBAR) as check dialyzer

RIAK_RELEASE

@@ -0,0 +1 @@
+3.2