Skip to content

[CDRIVER-6142] Refactor dependency/environment setup in Earthfile #2165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

[CDRIVER-6142] Refactor dependency/environment setup in Earthfile #2165

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a035401
Consolidate several small scripts into a single __tool
vector-of-bool Oct 29, 2025
5f4b103
Significant Earthfile refactor
vector-of-bool Oct 29, 2025
7b73e94
Update Earthly-generated tasks
vector-of-bool Oct 30, 2025
c22a137
Simplify some path handling in Earthfile
vector-of-bool Oct 30, 2025
f488eab
Fix: Allow Ccache to cache properly in Earthly targets
vector-of-bool Oct 30, 2025
358a337
Split out an +init target
vector-of-bool Oct 30, 2025
ec044b1
Update Earthly target documentation
vector-of-bool Oct 30, 2025
e5d322f
Rearrange some Earthly documentation
vector-of-bool Oct 30, 2025
31e88f8
Fix: Wrong build paths to +verify-headers
vector-of-bool Oct 30, 2025
bdd5741
Add Ubuntu 24.04
vector-of-bool Oct 30, 2025
71ffffc
Enable building both with/without Snappy in Earthly
vector-of-bool Oct 30, 2025
1f7d32a
Tasks with/without Snappy
vector-of-bool Oct 30, 2025
082ca14
Merge branch 'master' into CDRIVER-6142-earthfile-refactor
vector-of-bool Nov 10, 2025
e2308aa
Minor commentary tweaks following PR comments
vector-of-bool Nov 11, 2025
59829fc
Add a trailhead for obtaining the detailed Earthfile documentation
vector-of-bool Nov 12, 2025
9a6eb17
Refactor Earthly C++ installation to rely on the same C compiler param
vector-of-bool Nov 12, 2025
0a5ba4f
Fix environment setup when the C package provides C++
vector-of-bool Nov 12, 2025
f0c64eb
Better documentation on the __tool script
vector-of-bool Nov 12, 2025
d43510e
Drop use of Yum in __install
vector-of-bool Nov 12, 2025
792509e
Add a __download for checked downloads
vector-of-bool Nov 13, 2025
e36ac20
Tweak devdocs convenience destination
vector-of-bool Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions .evergreen/config_generator/components/earthly.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
CxxVersion = Literal['master', 'r4.1.0', 'none']
'C++ driver refs that are under CI test'
SnappyOption = Literal['false', 'true']
"""Should we enable Snappy compression in this build?"""

# A separator character, since we cannot use whitespace
_SEPARATOR = '\N{NO-BREAK SPACE}\N{BULLET}\N{NO-BREAK SPACE}'
Expand Down Expand Up @@ -98,7 +99,7 @@ class EarthlyVariant(NamedTuple):
"""

from_: EnvImage
c_compiler: CompilerName
compiler: CompilerName

@property
def display_name(self) -> str:
Expand All @@ -110,7 +111,7 @@ def display_name(self) -> str:
case name, version:
base = f'{name} {version}'
toolchain: str
match self.c_compiler:
match self.compiler:
case 'clang':
toolchain = 'LLVM/Clang'
case 'gcc':
Expand All @@ -123,7 +124,7 @@ def task_selector_tag(self) -> str:
The task tag that is used to select the tasks that want to run on this
variant.
"""
return f'{self.from_}-{self.c_compiler}'
return f'{self.from_}-{self.compiler}'

@property
def expansions(self) -> Mapping[str, str]:
Expand All @@ -132,7 +133,7 @@ def expansions(self) -> Mapping[str, str]:
from this object.
"""
return {
_CC_PARAM_NAME: self.c_compiler,
_CC_PARAM_NAME: self.compiler,
_ENV_PARAM_NAME: from_container_image(self.from_),
}

Expand Down Expand Up @@ -258,8 +259,9 @@ def earthly_task(
earthly_args |= {
# Add arguments that come from parameter expansions defined in the build variant
'from': f'${{{_ENV_PARAM_NAME}}}',
'c_compiler': f'${{{_CC_PARAM_NAME}}}',
'cxx_compiler': f'${{{_CC_PARAM_NAME}}}',
'compiler': f'${{{_CC_PARAM_NAME}}}',
# Always include a C++ compiler in the build environment for better test coverage
'with_cxx': 'true',
}
return EvgTask(
name=name,
Expand Down
Loading