Skip to content

Commit e37dba8

Browse files
committed
Revert "fix: testing possible bypass broken (#246)"
This reverts commit b751c28.
1 parent 7a3d3bb commit e37dba8

1 file changed

Lines changed: 19 additions & 2 deletions

File tree

.github/workflows/test_geos_integration.yml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,17 @@ jobs:
1212
outputs:
1313
tag: ${{ steps.get_tag.outputs.tag }}
1414
steps:
15+
- name: Checkout GEOS for devcontainer file
16+
uses: actions/checkout@v4
17+
with:
18+
repository: GEOS-DEV/GEOS
19+
ref: develop
20+
path: GEOS
21+
1522
- name: Extract TPL tag from devcontainer.json
1623
id: get_tag
1724
run: |
18-
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')
25+
TPL_TAG=$(jq -r '.build.args.GEOS_TPL_TAG' GEOS/.devcontainer/devcontainer.json)
1926
echo "tag=${TPL_TAG}" >> $GITHUB_OUTPUT
2027
2128
test_geos_integration:
@@ -100,7 +107,7 @@ jobs:
100107
-DENABLE_YAPF=OFF \
101108
-DGEOS_ENABLE_TESTS=OFF \
102109
-DGEOS_ENABLE_CONTACT=OFF \
103-
-DGEOS_ENABLE_FLUIDFLOW=ON \
110+
-DGEOS_ENABLE_FLUIDFLOW=OFF \
104111
-DGEOS_ENABLE_INDUCEDSEISMICITY=OFF \
105112
-DGEOS_ENABLE_MULTIPHYSICS=OFF \
106113
-DGEOS_ENABLE_SIMPLEPDE=OFF \
@@ -252,6 +259,16 @@ jobs:
252259
# Ensure geosx_python_tools is built (provides format_xml)
253260
echo "Building geosx_python_tools dependency..."
254261
make geosx_python_tools -j8
262+
263+
# The geosx_format_all_xml_files target has a bug - it depends on 'geosx_xml_tools' which doesn't exist
264+
# It should depend on 'geosx_python_tools'. Since we can't modify the CMakeLists.txt,
265+
# we'll run the formatting command directly instead
266+
# To solve the bug in cmake, we would have to change:
267+
# add_custom_target( geosx_format_all_xml_files
268+
# COMMAND bash ${CMAKE_SOURCE_DIR}/../scripts/formatXMLFiles.bash -g ${CMAKE_BINARY_DIR}/bin/format_xml ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/../examples
269+
# WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
270+
# DEPENDS geosx_python_tools # ← Change this!
271+
# )
255272
256273
echo "Running XML formatting directly (bypassing broken make target)..."
257274
if [ -f "bin/format_xml" ] && [ -f "$GEOS_ROOT/scripts/formatXMLFiles.bash" ]; then

0 commit comments

Comments
 (0)