From 9b9fb61007abf061f3e8354048ee7a84b0b9c122 Mon Sep 17 00:00:00 2001
From: Ivan Dyachkov <dev@dyachkov.org>
Date: Fri, 11 Oct 2024 14:38:38 +0200
Subject: [PATCH] ci: override included apps version for OTP 24

---
 .github/workflows/test.yaml | 15 +++++++++++++++
 Dockerfile                  |  1 +
 2 files changed, 16 insertions(+)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 3f46968..f0fcff9 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -120,6 +120,21 @@ jobs:
       with:
         driver-opts: network=host
     - uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
+      if: ${{ startsWith(matrix.otp, '24') }}
+      with:
+        platforms: ${{ matrix.platform.arch }}
+        cache-from: type=local,src=/tmp/.docker-buildx-cache,mode=max
+        build-args: |
+          BUILD_FROM=${{ steps.base_tag.outputs.image }}
+          OTP_VERSION=${{ matrix.otp }}
+          ELIXIR_VERSION=${{ matrix.elixir }}
+          BUILD_WITHOUT_QUIC=1
+          EMQTT_BENCH_VERSION=0.4.5
+          LUX_VERSION=lux-2.6
+        file: ./Dockerfile
+        context: .
+    - uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
+      if: ${{ ! startsWith(matrix.otp, '24') }}
       with:
         platforms: ${{ matrix.platform.arch }}
         cache-from: type=local,src=/tmp/.docker-buildx-cache,mode=max
diff --git a/Dockerfile b/Dockerfile
index 9d44579..268191e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ FROM ${BUILD_FROM}
 ENV EMQX_BUILDER_IMAGE=${BUILD_FROM}
 ENV ERL_AFLAGS="-kernel shell_history enabled"
 
+ARG BUILD_WITHOUT_QUIC=false
 ARG OTP_VERSION=27.1-1
 ARG ELIXIR_VERSION=1.17.3
 ARG FDB_VERSION=7.3.43