From 847b8c0969fc122e49309b1175140e157855ab5a Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 12 Jun 2024 09:39:54 -0500
Subject: [PATCH] More CI/CD updates.

---
 .github/workflows/ci.yml | 70 +++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4c409cb..f3637d7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,66 +9,56 @@ on:
 
 jobs:
 
-  older-rebar-builds:
-    name: Build on OTP ${{ matrix.otp_version }} w/ rebar ${{ matrix.rebar3-version }}
-    runs-on: ubuntu-latest
+  older-builds:
+    name: Erlang ${{ matrix.otp_version }} build
+    runs-on: ubuntu-20.04
 
     strategy:
       matrix:
-        otp_version: [19, 20, 21, 22, 23, 24]
-        rebar3-version: ['3.15.2']
-        os: [ubuntu-latest]
-
-    container:
-      image: erlang:${{ matrix.otp_version }}
+        otp_version: [19, 20, 21, 22, 23]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Download Recent Rebar
-      run: wget https://github.com/erlang/rebar3/releases/download/${{ matrix.rebar3-version }}/rebar3 && chmod 755 ./rebar3
-    - name: Update Path
-      run: echo "./" >> $GITHUB_PATH
+    - uses: actions/checkout@v4
+    - uses: erlef/setup-beam@v1
+      with:
+        otp-version: ${{ matrix.otp_version }}
+        rebar3-version: '3.15'
     - name: Check ./rebar3 Version
-      run: ./rebar3 --version
+      run: rebar3 --version
     - name: Compile
-      run: ./rebar3 compile
+      run: rebar3 compile
     - name: Xref Checks
-      run: ./rebar3 xref
+      run: rebar3 xref
     - name: Dialyzer
-      run: ./rebar3 dialyzer
+      run: rebar3 dialyzer
     - name: Run Tests
-      run: ./rebar3 eunit -v
+      run: rebar3 eunit -v
     - name: Test Coverage
-      run: ./rebar3 as test do proper -c, cover -v --min_coverage=0
+      run: rebar3 as test do proper -c, cover -v --min_coverage=0
 
-  newer-rebar-builds:
-    name: Build on OTP ${{ matrix.otp_version }} w/ rebar ${{ matrix.rebar3-version }}
+  newer-builds:
+    name: Erlang ${{ matrix.otp_version }} build
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        otp_version: [22, 23, 24, 25, 26, 27]
-        rebar3-version: ['3.16.1']
-        os: [ubuntu-latest]
-
-    container:
-      image: erlang:${{ matrix.otp_version }}
+        otp_version: [24, 25, 26, 27]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Download Recent Rebar
-      run: wget https://github.com/erlang/rebar3/releases/download/${{ matrix.rebar3-version }}/rebar3 && chmod 755 ./rebar3
-    - name: Update Path
-      run: echo "./" >> $GITHUB_PATH
-    - name: Check ./rebar3 Version
-      run: ./rebar3 --version
+    - uses: actions/checkout@v4
+    - uses: erlef/setup-beam@v1
+      with:
+        otp-version: ${{ matrix.otp_version }}
+        rebar3-version: '3.22'
+    - name: Check rebar3 Version
+      run: rebar3 --version
     - name: Compile
-      run: ./rebar3 compile
+      run: rebar3 compile
     - name: Xref Checks
-      run: ./rebar3 xref
+      run: rebar3 xref
     - name: Dialyzer
-      run: ./rebar3 dialyzer
+      run: rebar3 dialyzer
     - name: Run Tests
-      run: ./rebar3 eunit -v
+      run: rebar3 eunit -v
     - name: Test Coverage
-      run: ./rebar3 as test do proper -c, cover -v --min_coverage=0
+      run: rebar3 as test do proper -c, cover -v --min_coverage=0