Skip to content

Commit eb6b29b

Browse files
authored
SF-3509 Include server output in artifact after e2e test action is run (#3373)
1 parent ce98f04 commit eb6b29b

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.github/workflows/e2e-tests.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ name: E2E Tests
22
permissions: {}
33

44
on:
5-
pull_request:
6-
branches:
7-
- "e2e/**"
85
merge_group:
96
workflow_dispatch:
107
schedule:
@@ -487,6 +484,8 @@ jobs:
487484
if: always()
488485
with:
489486
name: e2e-test-results
490-
path: ./src/SIL.XForge.Scripture/ClientApp/e2e/test_output/ci_e2e_test_results/*.zip
491-
# Don't fail if no zip files are found
487+
path: |
488+
./src/SIL.XForge.Scripture/ClientApp/e2e/test_output/ci_e2e_test_results/*.zip
489+
./src/SIL.XForge.Scripture/ClientApp/e2e/test_output/ci_e2e_test_results/*.txt
490+
# Don't fail if no files are found
492491
if-no-files-found: ignore

src/SIL.XForge.Scripture/ClientApp/e2e/pre_merge_ci.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,10 @@ function shutDownServer() {
3939
kill -KILL "${pid}" 2>/dev/null
4040
}
4141

42-
DOTNET_LOG=""
43-
4442
function startServer() {
4543
cd "${SCRIPT_DIR}/../.."
46-
DOTNET_LOG="$(mktemp)"
44+
mkdir -p ./ClientApp/e2e/test_output/ci_e2e_test_results
45+
DOTNET_LOG="./ClientApp/e2e/test_output/ci_e2e_test_results/dotnet.txt"
4746
output "Logging dotnet output to ${DOTNET_LOG}"
4847
export ASPNETCORE_ENVIRONMENT="Development"
4948
nohup dotnet run &>"${DOTNET_LOG}" &

0 commit comments

Comments
 (0)