Consolidate duplication in Earthfile

Author: vector-of-bool

.github/workflows/ci.yml

@@ -17,96 +17,42 @@ jobs:
       - name: Check Formatting
         run: make format-check PYTHON_RUN="uv run --group=format"
 
-  build-alpine:
+  build-matrix:
+    name: Build & Test
+    runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        alpine_version:
-          - "3.19"
-          - "3.20"
-          - "3.21"
-          - "3.22"
-          - latest
-          - edge
-        # This arg is formatted in this way so that it is easily understandable in
-        # the GitHub Actions web interface
+        from:
+          # Alpine
+          - alpine:3.19
+          - alpine:3.20
+          - alpine:3.21
+          - alpine:3.22
+          - alpine:latest
+          - alpine:edge
+          # Ubuntu
+          - ubuntu:24.04
+          - ubuntu:latest
+          # Debian
+          - debian:12.11
+          - debian:latest
+          - debian:unstable
+          # GCC versions
+          - gcc:15.2.0
+          - gcc:14.3.0
+          - gcc:13.4.0
+          - gcc:12.5.0
+          - gcc:latest
+          # Clang versions
+          - +env.llvm --llvm_major_version=19
+          - +env.llvm --llvm_major_version=20
         vcpkg_arg: &vcpkg_arg
           - use_vcpkg=false
           - use_vcpkg=true
-    name: Build on Alpine
-    runs-on: ubuntu-latest
-    steps:
-      - *checkout
-      - name: Run Build
-        run: |
-          bash tools/earthly.sh +build-alpine \
-            --alpine_version=${{matrix.alpine_version}} \
-            --${{matrix.vcpkg_arg}}
-
-  build-ubuntu:
-    strategy:
-      matrix:
-        ubuntu_version:
-          - "24.04"
-          - latest
-        vcpkg_arg: *vcpkg_arg
-    name: Build on Ubuntu
-    runs-on: ubuntu-latest
-    steps:
-      - *checkout
-      - run: |
-          bash tools/earthly.sh +build-ubuntu \
-            --ubuntu_version=${{matrix.ubuntu_version}} \
-            --${{matrix.vcpkg_arg}}
-
-  build-debian:
-    strategy:
-      fail-fast: true
-      matrix:
-        debian_version:
-          - "12.11"
-          - latest
-          - unstable
-        vcpkg_arg: *vcpkg_arg
-    name: Build on Debian
-    runs-on: ubuntu-latest
     steps:
       - *checkout
       - run: |
-          bash tools/earthly.sh +build-debian \
-            --debian_version=${{matrix.debian_version}} \
+          bash tools/earthly.sh +build \
+            --from=${{matrix.from}} \
             --${{matrix.vcpkg_arg}}
-
-  build-gcc-matrix:
-    strategy:
-      fail-fast: true
-      matrix:
-        gcc_version:
-          - 15.2.0
-          - 14.3.0
-          - 13.4.0
-          - 12.5.0
-
-    runs-on: ubuntu-latest
-    name: "Build with GCC"
-    steps:
-      - *checkout
-      - name: Build
-        run: |
-          bash tools/earthly.sh +build-gcc \
-            --gcc_version=${{matrix.gcc_version}}
-
-  build-clang-matrix:
-    strategy:
-      fail-fast: true
-      matrix:
-        version_arg:
-          - clang_version_major=20
-          - clang_version_major=19
-    runs-on: ubuntu-latest
-    name: Build with Clang
-    steps:
-      - *checkout
-      - name: Build
-        run: |
-          bash tools/earthly.sh +build-clang \
-            --${{matrix.version_arg}}

Earthfile

@@ -3,14 +3,13 @@ VERSION 0.8
 # Tweak the default container registry used for pulling system images.
 ARG --global default_container_registry = "docker.io"
 
-build-gcc:
-    ARG --required gcc_version
-    # GCC provides a GCC container, based on Debian
-    FROM $default_container_registry/gcc:$gcc_version
+build:
+    ARG --required from
+    FROM --pass-args $from
     DO --pass-args +BOOTSTRAP_BUILD_INSTALL_EXPORT
 
-build-clang:
-    ARG --required clang_version_major
+env.llvm:
+    ARG --required llvm_major_version
     # LLVM doesn't provide a container, so we just use Ubuntu and the automated
     # LLVM installser script to get the appropriate major version
     FROM $default_container_registry/ubuntu:24.04
@@ -19,26 +18,10 @@ build-clang:
     RUN __install lsb-release software-properties-common gnupg
     # Install the major version using the automated LLVM installer:
     RUN curl -Ls https://apt.llvm.org/llvm.sh -o llvm.sh && \
-        bash llvm.sh "$clang_version_major"
+        bash llvm.sh "$llvm_major_version"
     # Declare our preferred compiler version using CC and CXX env vars
-    ENV CC=clang-$clang_version_major
-    ENV CXX=clang++-$clang_version_major
-    DO --pass-args +BOOTSTRAP_BUILD_INSTALL_EXPORT
-
-build-alpine:
-    ARG alpine_version=3.20
-    FROM $default_container_registry/alpine:$alpine_version
-    DO --pass-args +BOOTSTRAP_BUILD_INSTALL_EXPORT
-
-build-debian:
-    ARG debian_version=12.11
-    FROM $default_container_registry/debian:$debian_version
-    DO --pass-args +BOOTSTRAP_BUILD_INSTALL_EXPORT
-
-build-ubuntu:
-    ARG ubuntu_version=24.04
-    FROM $default_container_registry/ubuntu:$ubuntu_version
-    DO --pass-args +BOOTSTRAP_BUILD_INSTALL_EXPORT
+    ENV CC=clang-$llvm_major_version
+    ENV CXX=clang++-$llvm_major_version
 
 build-rl:
     FROM $default_container_registry/rockylinux:8