Skip to content
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

Jump to bottom

fix mktemp on macOS #1520

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix mktemp on macOS #1520

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
345fcfe
fix mktemp on macOS
lugi0 Jun 12, 2024
1ab4ddb
Merge branch 'master' into fix/macos-mktemp
lugi0 Jun 12, 2024
a5eca98
use single case for both Linux and MacOS
lugi0 Jun 12, 2024
2a645f7
Merge branch 'master' into fix/macos-mktemp
lugi0 Jun 12, 2024
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
16 changes: 8 additions & 8 deletions ods_ci/run_robot_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,19 +360,19 @@
fi
if ! ${SUBFOLDER}; then
case "$(uname -s)" in
Darwin)
# shellcheck disable=SC2046
TEST_ARTIFACT_DIR=$(mktemp -d "${TEST_ARTIFACT_DIR}" -t "${TEST_ARTIFACT_DIR}"/ods-ci-$(date +%Y-%m-%d-%H-%M)-XXXXXXXXXX)
;;
Linux)
# shellcheck disable=SC2046
TEST_ARTIFACT_DIR=$(mktemp -d -p "${TEST_ARTIFACT_DIR}" -t ods-ci-$(date +%Y-%m-%d-%H-%M)-XXXXXXXXXX)
;;
Darwin | Linux)
# shellcheck disable=SC2046
echo "Currently using the same mktemp command on Linux and MacOS"
TEST_ARTIFACT_DIR=$(mktemp -d -p "${TEST_ARTIFACT_DIR}" -t ods-ci-$(date +%Y-%m-%d-%H-%M)-XXXXXXXXXX)
;;
*)
echo "Unrecognized OS"
;;
esac
fi


robot ${TEST_EXCLUDE_TAG} ${TEST_INCLUDE_TAG} -d ${TEST_ARTIFACT_DIR} -x xunit_test_result.xml -r test_report.html ${TEST_VARIABLES} --variablefile ${TEST_VARIABLES_FILE} --exclude TBC ${EXTRA_ROBOT_ARGS} ${TEST_CASE_FILE}

Check warning on line 375 in ods_ci/run_robot_test.sh

View workflow job for this annotation

GitHub Actions / shellcheck linter 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./ods_ci/run_robot_test.sh:375:7:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Check warning on line 375 in ods_ci/run_robot_test.sh

View workflow job for this annotation

GitHub Actions / shellcheck linter 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./ods_ci/run_robot_test.sh:375:27:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Check warning on line 375 in ods_ci/run_robot_test.sh

View workflow job for this annotation

GitHub Actions / shellcheck linter 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./ods_ci/run_robot_test.sh:375:50:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Check warning on line 375 in ods_ci/run_robot_test.sh

View workflow job for this annotation

GitHub Actions / shellcheck linter 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./ods_ci/run_robot_test.sh:375:116:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Check warning on line 375 in ods_ci/run_robot_test.sh

View workflow job for this annotation

GitHub Actions / shellcheck linter 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./ods_ci/run_robot_test.sh:375:149:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Check warning on line 375 in ods_ci/run_robot_test.sh

View workflow job for this annotation

GitHub Actions / shellcheck linter 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./ods_ci/run_robot_test.sh:375:186:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Check warning on line 375 in ods_ci/run_robot_test.sh

View workflow job for this annotation

GitHub Actions / shellcheck linter 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./ods_ci/run_robot_test.sh:375:206:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)
# shellcheck disable=SC2116
exit_status=$(echo $?)
echo "${exit_status}"
Expand All @@ -386,7 +386,7 @@
then
echo "Test results artifacts are too large for email"
rm rf_results.tar.gz
tar cvzf rf_results.tar.gz $(find "${TEST_ARTIFACT_DIR}" -regex '.*\(xml\|html\)$') &> /dev/null

Check warning on line 389 in ods_ci/run_robot_test.sh

View workflow job for this annotation

GitHub Actions / shellcheck linter 

[shellcheck] reported by reviewdog 🐶
Quote this to prevent word splitting. [SC2046](https://github.com/koalaman/shellcheck/wiki/SC2046)

Raw Output:
./ods_ci/run_robot_test.sh:389:40:warning:Quote this to prevent word splitting. [SC2046](https://github.com/koalaman/shellcheck/wiki/SC2046)
fi
poetry run python3 ods_ci/utils/scripts/Sender/send_report.py send_email_report -s "${EMAIL_FROM}" -r "${EMAIL_TO}" -b "ODS-CI: Run Results" \
-v "${EMAIL_SERVER}" -a "rf_results.tar.gz" -u "${EMAIL_SERVER_USER}" -p "${EMAIL_SERVER_PW}" \
Expand Down
Loading