Skip to content

Commit f2c863b

Browse files
committed
Revert "CI: Allow Tests and Docs workflows to pass for segment fault on Windows (#4664)"
This reverts commit a286249.
1 parent 98d81db commit f2c863b

2 files changed

Lines changed: 5 additions & 27 deletions

File tree

.github/workflows/ci_docs.yml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ jobs:
5353
strategy:
5454
fail-fast: false
5555
matrix:
56-
os: [ubuntu-latest, macos-latest, windows-latest]
56+
os: [ubuntu-latest, macos-latest]
57+
# os: [ubuntu-latest, macos-latest, windows-latest]
5758
# Is it a draft Pull Request (true or false)?
5859
isDraft:
5960
- ${{ github.event.pull_request.draft }}
@@ -135,25 +136,10 @@ jobs:
135136
python -m pip install dist/*
136137
137138
- name: Build the HTML documentation
138-
run: |
139-
log_file="${RUNNER_TEMP}/sphinx-html.log"
140-
make -C doc clean html 2>&1 | tee "${log_file}"
141-
exit_code=${PIPESTATUS[0]}
142-
if [[ "${RUNNER_OS}" == "Windows" && "${exit_code}" -eq 2 ]] && grep -q "make: .* Error 2816" "${log_file}"; then
143-
echo "Sphinx HTML build exited with make error 2816 (segmentation fault) on Windows; allowing workflow to continue."
144-
exit 0
145-
fi
146-
exit "${exit_code}"
139+
run: make -C doc clean html
147140

148141
- name: Build the PDF documentation
149-
run: |
150-
log_file="${RUNNER_TEMP}/sphinx-latex.log"
151-
make -C doc latex 2>&1 | tee "${log_file}"
152-
exit_code=${PIPESTATUS[0]}
153-
if [[ "${RUNNER_OS}" == "Windows" && "${exit_code}" -eq 2 ]] && grep -q "make: .* Error 2816" "${log_file}"; then
154-
echo "Sphinx LaTeX build exited with make error 2816 (segmentation fault) on Windows; allowing workflow to continue."
155-
exit 0
156-
fi
142+
run: make -C doc pdf
157143

158144
- name: Create the HTML ZIP archive and rename the PDF file
159145
run: |

.github/workflows/ci_tests.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,7 @@ jobs:
189189

190190
# Run the regular tests
191191
- name: Run tests
192-
run: |
193-
log_file="${RUNNER_TEMP}/pytest.log"
194-
make test PYTEST_EXTRA="-r P --reruns 2" 2>&1 | tee "${log_file}"
195-
exit_code=${PIPESTATUS[0]}
196-
if [[ "${RUNNER_OS}" == "Windows" && "${exit_code}" -eq 2 ]] && grep -q "make: .* Error 2816" "${log_file}"; then
197-
echo "Tests exited with make error 2816 (segmentation fault) on Windows; allowing workflow to continue."
198-
exit 0
199-
fi
200-
exit "${exit_code}"
192+
run: make test PYTEST_EXTRA="-r P --reruns 2"
201193

202194
# Upload diff images on test failure
203195
- name: Upload diff images if any test fails

0 commit comments

Comments
 (0)