From 7ebae89f1a4c45e65f3c9dd5420453a6f4967473 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Tue, 16 Jul 2024 17:28:12 +0200
Subject: [PATCH] CI: Replace erlang container with setup-beam action

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f5c3a6f2..61d8b9e3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,10 +21,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        otp: [21, 25, 26, 27]
-    runs-on: ubuntu-22.04
-    container:
-      image: erlang:${{ matrix.otp }}
+        otp: [23, 26, 27]
+        elixir: ['1.13', '1.17']
+        exclude:
+        - otp: '23.0'
+          elixir: '1.17'
+        - otp: '26'
+          elixir: '1.13'
+        - otp: '27'
+          elixir: '1.13'
+    runs-on: ubuntu-20.04
 
     steps:
 
@@ -33,13 +39,19 @@ jobs:
       with:
         repository: processone/ejabberd
 
+    - name: Get specific Erlang/OTP
+      uses: erlef/setup-beam@v1
+      with:
+        otp-version: ${{matrix.otp}}
+        elixir-version: ${{matrix.elixir}}
+
     - name: Checkout ejabberd-contrib
       uses: actions/checkout@v4
       with:
         path: .ejabberd-modules/sources/ejabberd-contrib
 
     - name: Get a compatible Rebar3
-      if: matrix.otp <= 21
+      if: matrix.otp <= 23
       run: |
         rm rebar3
         wget https://github.com/processone/ejabberd/raw/21.12/rebar3
@@ -47,9 +59,9 @@ jobs:
 
     - name: Prepare libraries
       run: |
-        apt-get -qq update
-        apt-get -y purge libgd3 nginx
-        apt-get -qq install libexpat1-dev libgd-dev libpam0g-dev \
+        sudo apt-get -qq update
+        sudo apt-get -y purge libgd3 nginx
+        sudo apt-get -qq install libexpat1-dev libgd-dev libpam0g-dev \
                                  libsqlite3-dev libwebp-dev libyaml-dev
 
     - name: Prepare rebar
@@ -159,7 +171,7 @@ jobs:
       run: |
         rm -rf _build/default/lib/ejabberd/ebin/fusco*
         rm -rf _build/default/lib/ejabberd/ebin/observer_cli*
-        make dialyzer # Too many errors... first fix them, then enable this
+        make dialyzer
 
     - name: View logs dir
       if: always()