Skip to content

Commit

Permalink
ci: build all images from gentoo-crossdev-image
Browse files Browse the repository at this point in the history
  • Loading branch information
odrling committed Jan 30, 2024
1 parent 5ec0e53 commit e5a3ff2
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 17 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,8 @@ jobs:
matrix:
config:
- arch: x86_64
containerfile: Containerfile
platform: linux/amd64
- arch: aarch64
containerfile: Containerfile.aarch64
platform: linux/arm64

steps:
Expand All @@ -58,7 +56,8 @@ jobs:
image: ${{ env.IMAGE_NAME }}
tags: ${{ github.sha }}-${{ matrix.config.arch }}
labels: ${{ steps.meta.outputs.labels }}
containerfiles: ${{ matrix.config.containerfile }}
build-args: ARCH=${{ matrix.config.arch }}
containerfiles: Containerfile

- name: Push image
id: push-image
Expand Down
7 changes: 4 additions & 3 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
FROM alpine AS builder
RUN apk add musl-dev meson clang compiler-rt git linux-headers lld tar
ARG ARCH
FROM ghcr.io/odrling/gentoo-crossdev-images:$ARCH-llvm17 AS builder

COPY . /dakara_check

RUN cd /dakara_check && /dakara_check/ci/build.sh
ARG ARCH
RUN cd /dakara_check && /dakara_check/ci/build.sh --cross-file ci/$ARCH-unknown-linux-musl.txt

FROM alpine

Expand Down
11 changes: 0 additions & 11 deletions Containerfile.aarch64

This file was deleted.

13 changes: 13 additions & 0 deletions ci/x86_64-unknown-linux-musl.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[binaries]
c = 'x86_64-unknown-linux-musl-clang'
ld = 'ld.lld'
objcopy = 'llvm-objcopy'
strip = 'llvm-strip'
pkg-config = 'x86_64-unknown-linux-musl-pkg-config'

[host_machine]
system = 'linux'
cpu_family = 'x86_64'
cpu = 'x86_64'
endian = 'little'

0 comments on commit e5a3ff2

Please sign in to comment.