Skip to content

Commit cdf36e6

Browse files
committed
Update e2e test messages and adjust Windows ARM64 handling in setup script
1 parent 1c1c462 commit cdf36e6

2 files changed

Lines changed: 4 additions & 9 deletions

File tree

.github/workflows/graphs/build-test-publish.act

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -198,16 +198,13 @@ nodes:
198198
cp "$OUTPUT_CLI" "$TMP_ACTRUN"
199199
# encoding needed since default on Windows is cp1252
200200
PYTHONIOENCODING=utf-8 python tests_e2e/tests_e2e.py
201-
echo "DEBUG: python exited $?"
202201
rm "$TMP_ACTRUN" || true
203-
echo "DEBUG: rm exited $?"
204202
else
205-
echo "DEBUG: skipping e2e (OS/ARCH mismatch)"
203+
echo "OS and ARCH do not match the current system ($OS != $CURRENT_OS $ARCH != $CURRENT_ARCH). Skipping e2e tests."
206204
fi
207205
else
208-
echo "DEBUG: skipping e2e (not free license)"
206+
echo "Skipping e2e tests for pro license."
209207
fi
210-
echo "DEBUG: run_e2e_tests returning"
211208
}
212209

213210

@@ -229,8 +226,6 @@ nodes:
229226

230227
run_e2e_tests
231228

232-
echo "DEBUG: reached end of script, about to exit 0"
233-
234229
exit 0
235230
env: []
236231
comment: build the cli and dll

setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ case "$OS" in
5151
;;
5252
windows)
5353
if [[ "$ARCH" == "arm64" ]]; then
54-
echo "Windows ARM64 is not supported by the Perforce C++ API SDK."
55-
exit 1
54+
echo "Windows ARM64 is not supported by the Perforce C++ API SDK. Skipping."
55+
exit 0
5656
fi
5757
URL="${P4API_BASE_URL}/bin.mingw64x64/p4api-openssl3_gcc8_posix_seh.zip"
5858
LIB_DIR="${P4API_DIR}/windows-x86_64/lib"

0 commit comments

Comments
 (0)