Skip to content

Commit 6913c30

Browse files
authored
Merge pull request #301 from id/20251006-use-newer-builder
ci: use latest builder image
2 parents edd6ba2 + 6ff46f3 commit 6913c30

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.github/workflows/build.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
otp:
12-
- 27.2-3
12+
- 27.3.4.2-4
1313
elixir:
1414
- 1.18.3
1515
steps:
@@ -39,15 +39,15 @@ jobs:
3939
tags: ${{ steps.meta.outputs.tags }}
4040
labels: ${{ steps.meta.outputs.labels }}
4141
build-args: |
42-
FROM=ghcr.io/emqx/emqx-builder/5.5-2:${{ matrix.elixir }}-${{ matrix.otp }}-debian12
42+
FROM=ghcr.io/emqx/emqx-builder/5.6-3:${{ matrix.elixir }}-${{ matrix.otp }}-debian13
4343
4444
linux:
4545
runs-on: ${{ matrix.arch == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
4646
strategy:
4747
fail-fast: false
4848
matrix:
4949
otp:
50-
- 27.2-3
50+
- 27.3.4.2-4
5151
elixir:
5252
- 1.18.3
5353
quic_support:
@@ -61,7 +61,7 @@ jobs:
6161
- arm64
6262

6363
container:
64-
image: ghcr.io/emqx/emqx-builder/5.5-2:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
64+
image: ghcr.io/emqx/emqx-builder/5.6-3:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
6565

6666
steps:
6767
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

.github/workflows/release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
otp:
23-
- 27.2-3
23+
- 27.3.4.2-4
2424
elixir:
2525
- 1.18.3
2626
steps:
@@ -52,14 +52,14 @@ jobs:
5252
tags: ${{ steps.meta.outputs.tags }}
5353
labels: ${{ steps.meta.outputs.labels }}
5454
build-args: |
55-
FROM=ghcr.io/emqx/emqx-builder/5.5-2:${{ matrix.elixir }}-${{ matrix.otp }}-debian12
55+
FROM=ghcr.io/emqx/emqx-builder/5.6-3:${{ matrix.elixir }}-${{ matrix.otp }}-debian13
5656
5757
linux:
5858
strategy:
5959
fail-fast: false
6060
matrix:
6161
otp:
62-
- 27.2-3
62+
- 27.3.4.2-4
6363
elixir:
6464
- 1.18.3
6565
quic_support:
@@ -78,7 +78,7 @@ jobs:
7878
- arm64
7979
runs-on: ${{ matrix.arch == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
8080
env:
81-
IMAGE: ghcr.io/emqx/emqx-builder/5.5-2:1.18.3-${{ matrix.otp }}-${{ matrix.os }}
81+
IMAGE: ghcr.io/emqx/emqx-builder/5.6-3:1.18.3-${{ matrix.otp }}-${{ matrix.os }}
8282

8383
steps:
8484
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
ARG FROM=ghcr.io/emqx/emqx-builder/5.5-2:1.18.3-27.2-3-debian12
1+
ARG FROM=ghcr.io/emqx/emqx-builder/5.6-3:1.18.3-27.3.4.2-4-debian13
22
FROM ${FROM} AS builder
33
COPY . /emqtt_bench
44
WORKDIR /emqtt_bench
55
ENV BUILD_WITHOUT_QUIC=1
66
RUN make release
77

8-
FROM debian:12-slim
8+
FROM debian:13-slim
99

1010
COPY --from=builder /emqtt_bench/emqtt-bench-*.tar.gz /emqtt_bench/
1111

0 commit comments

Comments
 (0)