Skip to content

Commit fe1cdff

Browse files
Add RHEL 8, rename "from" to "env"
1 parent c97ac92 commit fe1cdff

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
from:
26+
env:
2727
# Alpine
2828
- alpine:3.19
2929
- alpine:3.20
@@ -59,23 +59,25 @@ jobs:
5959
- use_vcpkg=true
6060
include:
6161
# Add Almalinux (RHEL) targets, alwasy using vcpkg
62-
- { from: almalinux:latest, vcpkg_arg: use_vcpkg=true }
63-
- { from: almalinux:10, vcpkg_arg: use_vcpkg=true }
64-
# RHEL 9 requires a newer GCC, using the GCC toolset:
65-
- { from: almalinux:9 --gts_version=12, vcpkg_arg: use_vcpkg=true }
66-
- { from: almalinux:9 --gts_version=13, vcpkg_arg: use_vcpkg=true }
67-
- { from: almalinux:9 --gts_version=14, vcpkg_arg: use_vcpkg=true }
62+
- { env: almalinux:10, vcpkg_arg: use_vcpkg=true }
63+
# RHEL ≤9 requires a newer GCC, using the GCC toolset:
64+
- { env: almalinux:9 --gts_version=14, vcpkg_arg: use_vcpkg=true }
65+
- { env: almalinux:9 --gts_version=13, vcpkg_arg: use_vcpkg=true }
66+
- { env: almalinux:9 --gts_version=12, vcpkg_arg: use_vcpkg=true }
67+
# RHEL 8
68+
- { env: almalinux:8 --gts_version=13, vcpkg_arg: use_vcpkg=true }
69+
- { env: almalinux:8 --gts_version=12, vcpkg_arg: use_vcpkg=true }
6870
steps:
6971
- *checkout
7072
- name: Build
7173
run: |
7274
bash tools/earthly.sh +build \
73-
--from=${{matrix.from}} \
75+
--env=${{matrix.env}} \
7476
--${{matrix.vcpkg_arg}}
7577
# This step will use the same cached +build results as long as all Earthly
7678
# build arguments are equivalent. Make sure of that!
7779
- name: Test
7880
run: |
7981
bash tools/earthly.sh -a +test/results.xml results.xml \
80-
--from=${{matrix.from}} \
82+
--env=${{matrix.env}} \
8183
--${{matrix.vcpkg_arg}}

Earthfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ VERSION 0.8
44
ARG --global default_container_registry = "docker.io"
55

66
init:
7-
ARG --required from
7+
ARG --required env
88
# Toggle the building of test programs
99
ARG test = true
1010
# Toggle whether we use vcpkg to obtain dependencies
1111
ARG use_vcpkg = true
12-
FROM --pass-args $from
12+
FROM --pass-args $env
1313
DO --pass-args +INSTALL_DEPS
1414

1515
build:
@@ -23,7 +23,7 @@ build:
2323
test:
2424
FROM --pass-args +build
2525
RUN uv run --group=build \
26-
make ctest-run TEST_CONFIG=Debug JUNIT_OUTPUT=/results.xml || :
26+
make ctest-run TEST_CONFIG=Debug JUNIT_OUTPUT=/results.xml
2727
SAVE ARTIFACT /results.xml
2828

2929
# Target used to install LLVM for a build. Not used outside this file
@@ -65,7 +65,7 @@ BASE:
6565
# Install EPEL on RHEL-based platforms
6666
RUN __install epel-release
6767
END
68-
RUN __install lsb-release && \
68+
RUN (__install lsb-release || __install redhat-lsb-core) && \
6969
(curl --version || __install curl)
7070

7171
# Obtain uv

0 commit comments

Comments
 (0)