From c27a1bdfb4acbe5e4196b623b488551b672bbd38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl=20H=C3=B6rberg?= Date: Tue, 20 Feb 2024 22:30:23 +0100 Subject: [PATCH] Build rpm packages for fedora 39 --- .github/workflows/rpm.yml | 4 ++-- Dockerfile.rpm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rpm.yml b/.github/workflows/rpm.yml index 1fa5d52..200a04d 100644 --- a/.github/workflows/rpm.yml +++ b/.github/workflows/rpm.yml @@ -26,7 +26,7 @@ jobs: name: Build RPM strategy: matrix: - os: ['fedora-37'] + os: ['fedora-39'] runs-on: ubuntu-latest concurrency: ${{ github.workflow }}-depot steps: @@ -67,7 +67,7 @@ jobs: file: Dockerfile.rpm platforms: linux/amd64,linux/arm64 build-args: | - build_image=84codes/crystal:1.6.2-${{ matrix.os }} + build_image=84codes/crystal:latest-${{ matrix.os }} version=${{ env.version }} outputs: RPMS diff --git a/Dockerfile.rpm b/Dockerfile.rpm index 0db2a48..3cf7577 100644 --- a/Dockerfile.rpm +++ b/Dockerfile.rpm @@ -1,4 +1,4 @@ -ARG build_image=84codes/crystal:latest-fedora-37 +ARG build_image=84codes/crystal:latest-fedora-39 FROM $build_image AS builder RUN dnf install -y --nodocs --setopt=install_weak_deps=False --repo=fedora,updates \ @@ -19,7 +19,7 @@ ARG MAKEFLAGS RUN rpmbuild -ba /root/rpmbuild/SPECS/amqproxy.spec RUN rpmlint /root/rpmbuild/RPMS/* || true -FROM fedora:37 AS test +FROM fedora:39 AS test COPY --from=builder /root/rpmbuild/RPMS /tmp/RPMS RUN find /tmp/RPMS -type f -exec dnf install -y {} \; RUN amqproxy --version