Skip to content

fix: testing possible bypass broken #246

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

Merged
jafranc merged 2 commits into from
Apr 2, 2026
+2 −19
Merged

fix: testing possible bypass broken #246

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d137d6
testing possible bypass broken
jafranc Apr 2, 2026
6d1065c
avoid unneeded checkout
jafranc Apr 2, 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
21 changes: 2 additions & 19 deletions .github/workflows/test_geos_integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,10 @@ jobs:
outputs:
tag: ${{ steps.get_tag.outputs.tag }}
steps:
- name: Checkout GEOS for devcontainer file
uses: actions/checkout@v4
with:
repository: GEOS-DEV/GEOS
ref: develop
path: GEOS

- name: Extract TPL tag from devcontainer.json
id: get_tag
run: |
TPL_TAG=$(jq -r '.build.args.GEOS_TPL_TAG' GEOS/.devcontainer/devcontainer.json)
TPL_TAG=$(curl -s -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/GEOS-DEV/GEOS/contents/.devcontainer/devcontainer.json" | jq -r '.build.args.GEOS_TPL_TAG')
echo "tag=${TPL_TAG}" >> $GITHUB_OUTPUT

test_geos_integration:
Expand Down Expand Up @@ -107,7 +100,7 @@ jobs:
-DENABLE_YAPF=OFF \
-DGEOS_ENABLE_TESTS=OFF \
-DGEOS_ENABLE_CONTACT=OFF \
-DGEOS_ENABLE_FLUIDFLOW=OFF \
-DGEOS_ENABLE_FLUIDFLOW=ON \
-DGEOS_ENABLE_INDUCEDSEISMICITY=OFF \
-DGEOS_ENABLE_MULTIPHYSICS=OFF \
-DGEOS_ENABLE_SIMPLEPDE=OFF \
Expand Down Expand Up @@ -259,16 +252,6 @@ jobs:
# Ensure geosx_python_tools is built (provides format_xml)
echo "Building geosx_python_tools dependency..."
make geosx_python_tools -j8

# The geosx_format_all_xml_files target has a bug - it depends on 'geosx_xml_tools' which doesn't exist
# It should depend on 'geosx_python_tools'. Since we can't modify the CMakeLists.txt,
# we'll run the formatting command directly instead
# To solve the bug in cmake, we would have to change:
# add_custom_target( geosx_format_all_xml_files
# COMMAND bash ${CMAKE_SOURCE_DIR}/../scripts/formatXMLFiles.bash -g ${CMAKE_BINARY_DIR}/bin/format_xml ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/../examples
# WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
# DEPENDS geosx_python_tools # ← Change this!
# )

echo "Running XML formatting directly (bypassing broken make target)..."
if [ -f "bin/format_xml" ] && [ -f "$GEOS_ROOT/scripts/formatXMLFiles.bash" ]; then
Expand Down
Loading