From 3c85199e0df79bcfd1bb253b8faa47b0cbd7ee81 Mon Sep 17 00:00:00 2001
From: Andreas Schultz <andreas.schultz@travelping.com>
Date: Mon, 13 May 2024 16:22:10 +0200
Subject: [PATCH] upgrade dependencies and OTP to 26.2

---
 .github/workflows/main.yml | 22 ++++++++++++----------
 README.md                  |  2 +-
 rebar.config               | 14 +++++++-------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b78303e0..f10b1252 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,10 +12,10 @@ on:
 jobs:
   test:
     name: CI
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        otp: [22.3, 23.3, 24.1, 25.1]
+        otp: [26.2]
     container:
       image: quay.io/travelping/alpine-erlang:${{ matrix.otp }}
     steps:
@@ -24,8 +24,9 @@ jobs:
            apk update
            apk --no-cache upgrade
            apk --no-cache add gcc git libc-dev libc-utils libgcc linux-headers make bash \
-                              musl-dev musl-utils ncurses-dev pcre2 pkgconf scanelf wget zlib
-    - uses: actions/checkout@v3
+                              musl-dev musl-utils ncurses-dev pcre2 pkgconf scanelf wget \
+                              zlib zstd
+    - uses: actions/checkout@v4
     - name: Build
       run: rebar3 compile
     - name: Run tests
@@ -37,18 +38,19 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         COVERALLS_FLAG_NAME: ${{ matrix.otp }}
       run: DEBUG=1 rebar3 as test coveralls send || /bin/true
+    - name: Tar Test Output
+      if: ${{ always() }}
+      run: tar -cf - _build/test/logs/ | zstd -15 -o ct-logs-${{ matrix.otp }}.tar.zst
     - name: Archive Test Output
       if: ${{ always() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: test-output-${{ matrix.otp }}
-        path: |
-          _build/test/logs/
-          !_build/test/logs/last
+        path: ct-logs-${{ matrix.otp }}.tar.zst
 
   slack:
     needs: test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: always()
     steps:
     - name: Slack notification
@@ -66,7 +68,7 @@ jobs:
 
   finish:
     needs: test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: always()
     steps:
     - name: Coveralls Finished
diff --git a/README.md b/README.md
index 1f4ca707..381b903f 100644
--- a/README.md
+++ b/README.md
@@ -219,4 +219,4 @@ Example of possible config.
 [gh badge]: https://img.shields.io/github/workflow/status/travelping/ergw_aaa/CI?style=flat-square
 [coveralls]: https://coveralls.io/github/travelping/ergw_aaa
 [coveralls badge]: https://img.shields.io/coveralls/travelping/ergw_aaa/master.svg?style=flat-square
-[erlang version badge]: https://img.shields.io/badge/erlang-20.3%20to%2024.0.2-blue.svg?style=flat-square
+[erlang version badge]: https://img.shields.io/badge/erlang-26.2%20to%2026.2-blue.svg?style=flat-square
diff --git a/rebar.config b/rebar.config
index 555c4a59..c5432de2 100644
--- a/rebar.config
+++ b/rebar.config
@@ -3,21 +3,21 @@
 
 {deps, [
 	{setup, "2.1.0"},
-	{prometheus, "4.8.1"},
+	{prometheus, "4.11.0"},
 	{eradius, "2.3.1"},
 	{regine, "1.1.0"},
-	{cut, "1.0.3"},
-	{gtplib, "3.2.0"}
+	{cut, {git, "https://github.com/travelping/cut.git", {branch, "master"}}},
+	{gtplib, {git, "https://github.com/travelping/gtplib.git", {tag, "4.0.0"}}}
 ]}.
 
-{minimum_otp_vsn, "21.3"}.
-{plugins, [{rebar3_diameter_compiler, "0.7.0"}]}.
+{minimum_otp_vsn, "26.2"}.
+{plugins, [rebar3_diameter_compiler]}.
 
 {profiles, [
 	    {test, [
 		    {deps, [
-				{meck, "0.8.13"},
-				{erlando, {git, "https://github.com/travelping/erlando.git", {tag, "1.0.4"}}}
+			    {meck, "0.9.2"},
+			    {erlando, {git, "https://github.com/travelping/erlando.git", {branch, "master"}}}
 			]},
 		    {plugins, [{coveralls, {git, "https://github.com/RoadRunnr/coveralls-erl.git", {branch, "feature/git-info"}}}]}
 		   ]}