From eeacbace8c6eb52d73667fac56b7ff6f9d619c3b Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Wed, 29 Nov 2023 20:53:28 +0100
Subject: [PATCH] ci: add otp 26

---
 .github/workflows/main.yml     |  4 ++--
 .github/workflows/release.yaml | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b207edd4..84c7c415 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,8 +10,8 @@ jobs:
         os:
           - macos-12
         otp:
-          - 24
           - 25
+          - 26
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -67,8 +67,8 @@ jobs:
       fail-fast: false
       matrix:
         otp:
-          - 24.3.4
           - 25.3.2
+          - 26.1.2
         openssl:
           - openssl3
           - openssl
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 8f3f1262..d150e154 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -12,7 +12,8 @@ jobs:
       fail-fast: false
       matrix:
         otp:
-          - 25.3.2-1
+          - 25.3.2-2
+          - 26.1.2-1
         openssl:
           - openssl3
           - openssl
@@ -53,14 +54,11 @@ jobs:
       fail-fast: false
       matrix:
         builder:
-          - 5.1-3
-        otp:
-          - 25.3.2-1
+          - 5.2-7:1.15.7-25.3.2-2
+          - 5.2-7:1.15.7-26.1.2-1
         openssl:
           - openssl3
           - openssl
-        elixir:
-          - 1.14.5
         arch:
           - amd64
           - arm64
@@ -99,7 +97,7 @@ jobs:
       - name: build release
         if: startsWith(github.ref, 'refs/tags/')
         run: |
-          IMAGE=ghcr.io/emqx/emqx-builder/${{ matrix.builder }}:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
+          IMAGE=ghcr.io/emqx/emqx-builder/${{ matrix.builder }}-${{ matrix.os }}
           docker run -i --rm -v $(pwd):/wd --workdir /wd --platform=linux/${{ matrix.arch }} \
           -e BUILD_RELEASE=1 -e QUIC_TLS=${{ matrix.openssl }} \
           $IMAGE bash -euc 'git config --global --add safe.directory /wd; make'