Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
fa94936
update CI images and remove old specs
rrsettgast May 1, 2026
583ebdd
Merge branch 'develop' into ci/updateImages
rrsettgast May 1, 2026
32d11ae
revert some leaked changes
rrsettgast May 1, 2026
cb967c1
use correct tag
rrsettgast May 1, 2026
9e58f2a
clang flag to avoid incorrect fp behavior
rrsettgast May 3, 2026
77cf501
add diagnostics for failing tests
rrsettgast May 3, 2026
57573d9
investigate the FPE coming out of vtk, and possible threading errors …
rrsettgast May 4, 2026
cdabcbe
more debugging of the clang unit test failures
rrsettgast May 4, 2026
b381425
revert changes. turn off unit testing in clang cpu builds
rrsettgast May 4, 2026
62c2c5d
Merge branch 'develop' into ci/updateImages
rrsettgast May 4, 2026
6162d75
Update GEOS_TPL_TAG to version 349-1012
rrsettgast May 4, 2026
7e37e54
add target specific cuda architecture to CI
rrsettgast May 4, 2026
da808a1
fix lcov issue. fix python issue for integrated test
rrsettgast May 4, 2026
78c8220
try to fix integrated tests python packages install
rrsettgast May 5, 2026
dfe5592
up memory for debug build
rrsettgast May 5, 2026
b030814
fix codcov bug
rrsettgast May 5, 2026
3818118
Update GEOS_TPL_TAG to version 349-1013
rrsettgast May 5, 2026
fead093
longer runtime for overrun test. native optimization on integratedTes…
rrsettgast May 6, 2026
04520f4
Merge branch 'ci/updateImages' of github.com:GEOS-DEV/GEOS into ci/up…
rrsettgast May 6, 2026
5230f30
yet another attempt to fix ccov and integrateTests
rrsettgast May 6, 2026
693a34e
skipping ubuntu clang19 since it always is missing sccache. change me…
rrsettgast May 6, 2026
aafb971
more gcov issues
rrsettgast May 6, 2026
7392b83
another try
rrsettgast May 6, 2026
262baa6
Merge branch 'develop' into ci/updateImages
rrsettgast May 6, 2026
444a7bc
disable codecov
rrsettgast May 6, 2026
57b6239
Merge branch 'develop' into ci/updateImages
rrsettgast May 7, 2026
1ee4266
update LC hostconfigs
castelletto1 May 7, 2026
5188bcd
update TPL TAG
rrsettgast May 7, 2026
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
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# If you are building the current `Dockerfile` to use codespaces in the cloud,
# you most likely want to define this variable in the `.devcontainer/devcontainer.json` file.
ARG GEOS_TPL_TAG
FROM docker.io/geosx/ubuntu20.04-gcc10:${GEOS_TPL_TAG}
FROM docker.io/geosx/ubuntu24.04-gcc13:${GEOS_TPL_TAG}

RUN apt-get update
RUN apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"GEOS_TPL_TAG": "344-968"
"GEOS_TPL_TAG": "349-1014"
}
},
"runArgs": [
Expand Down
5 changes: 5 additions & 0 deletions .github/ci/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ Required fields (all of them, always):
the prefix before the first `-`, so a runner label like `streak2-32core` will reuse the
`streak2` entry. Use `{}` for runners that do not need an LLNL-style outbound cert bundle.

- `runner_cuda_architectures`
Map keyed by runner label, not by workflow role. Each value is forwarded to CMake as
`CMAKE_CUDA_ARCHITECTURES` for CUDA jobs on that runner. The same exact-match then prefix
fallback used by `runner_ca_bundle_host_paths` applies. Example: `{"streak2": "86"}`.

- `runners`
Map from runner role to runner label. Required roles:
- `default`
Expand Down
1 change: 1 addition & 0 deletions .github/ci/orgs/EarthFlowAI.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"artifact_public_url_base": "https://pub-17b272fb651e459ca81dd0fd457099ed.r2.dev",
"artifact_public_url_bucket_scoped": true,
"runner_ca_bundle_host_paths": {},
"runner_cuda_architectures": { "thinkpad": "120" },
"runners": {
"default": "ubuntu-22.04",
"cpu_heavy": "32core",
Expand Down
1 change: 1 addition & 0 deletions .github/ci/orgs/GEOS-DEV.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"artifact_public_url_base": "https://storage.googleapis.com",
"artifact_public_url_bucket_scoped": false,
"runner_ca_bundle_host_paths": { "streak2": "/etc/pki/tls/certs/ca-bundle.crt" },
"runner_cuda_architectures": { "streak2": "86" },
"runners": {
"default": "ubuntu-22.04",
"cpu_heavy": "streak2",
Expand Down
16 changes: 15 additions & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,18 @@ on:
CMAKE_BUILD_TYPE:
required: true
type: string
CMAKE_CUDA_ARCHITECTURES:
required: false
type: string
default: ''
CODE_COVERAGE:
required: false
type: boolean
default: false
CTEST_PARALLEL_LEVEL:
required: false
type: string
default: ''
DOCKER_IMAGE_TAG:
required: true
type: string
Expand Down Expand Up @@ -626,6 +634,9 @@ jobs:
if [ ! -z "${{ inputs.GEOS_ENABLE_BOUNDS_CHECK }}" ]; then
script_args+=(--geos-enable-bounds-check "${{ inputs.GEOS_ENABLE_BOUNDS_CHECK }}")
fi
if [ ! -z "${{ inputs.CMAKE_CUDA_ARCHITECTURES }}" ]; then
script_args+=(--cmake-cuda-architectures "${{ inputs.CMAKE_CUDA_ARCHITECTURES }}")
fi

# The linear algebra environment variables (ENABLE_HYPRE, ENABLE_HYPRE_DEVICE & ENABLE_TRILINOS)
# are passed as scripts parameters. Specific care must be taken to be sure
Expand Down Expand Up @@ -670,6 +681,10 @@ jobs:
docker_args+=(--name ${CONTAINER_NAME})


if [[ -n "${{ inputs.CTEST_PARALLEL_LEVEL }}" ]]; then
script_args+=(--ctest-parallel-level "${{ inputs.CTEST_PARALLEL_LEVEL }}")
fi

if ${{ inputs.CODE_COVERAGE }} == 'true'; then
script_args+=(--code-coverage)
fi
Expand Down Expand Up @@ -859,4 +874,3 @@ jobs:
-v "${GITHUB_WORKSPACE}:/tmp/geos" \
alpine:3.20 \
sh -lc 'rm -rf /tmp/geos/* /tmp/geos/.[!.]* /tmp/geos/..?* || true'

Loading