From df2c1b7d81d05023105e086bfb6ab0baf2d98eee Mon Sep 17 00:00:00 2001
From: Peter Kurfer <peter@icb4dc0.de>
Date: Wed, 12 Feb 2025 15:42:40 +0100
Subject: [PATCH] feat: rework act image build
---
.forgejo/workflows/act_runtime.yaml | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/.forgejo/workflows/act_runtime.yaml b/.forgejo/workflows/act_runtime.yaml
index ad705ef..a78ab56 100644
--- a/.forgejo/workflows/act_runtime.yaml
+++ b/.forgejo/workflows/act_runtime.yaml
@@ -10,20 +10,14 @@ on:
- ".forgejo/workflows/act_runtime.yaml"
- "act_runtime/**"
-env:
- TAGS: '{"ubuntu-latest": {"ubuntu:22.04": "22.04-arm64","ubuntu:24.04": "arm64"}}'
- VERSIONS: '{"ubuntu:22.44": {"llvm": "19"},"ubuntu:24.04": {"llvm": "19"}}'
-
jobs:
build_images:
strategy:
matrix:
- os:
- - ubuntu-latest
- base:
- - ubuntu:22.04
- - ubuntu:24.04
- runs-on: ${{ matrix.os }}
+ base_tage:
+ - "22.04"
+ - "24.04"
+ runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -42,7 +36,7 @@ jobs:
with:
context: "./act_runtime"
push: true
- tags: code.icb4dc0.de/infrastructure/images/act_runtime:${{ fromJSON(env.TAGS)[matrix.os][matrix.base] }}
+ platforms: linux/amd64,linux/arm64
+ tags: code.icb4dc0.de/infrastructure/images/act_runtime:${{ matrix.base_tage }}
build-args: |
- BASE_IMAGE=${{ matrix.base }}
- LLVM_VERSION=${{ fromJSON(env.VERSIONS)[matrix.base]["llvm"] }}
+ BASE_IMAGE=ubuntu:${{ matrix.base_tage }}