From 16186d58b2045d35b5d3945b64b6079a0133690e Mon Sep 17 00:00:00 2001 From: German <28149841+germa89@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:01:18 +0100 Subject: [PATCH 1/3] ci: skipping student versions when user is authenticated --- .ci/build_matrix.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.ci/build_matrix.sh b/.ci/build_matrix.sh index 04d89e2ef3..b1d718be85 100755 --- a/.ci/build_matrix.sh +++ b/.ci/build_matrix.sh @@ -30,7 +30,7 @@ LATEST=3 # for 'latest-ubuntu' and 'latest-ubuntu-student' ONLY_UBUNTU="${ONLY_UBUNTU:-false}" # Do not process more than the $AUTH_USER_LIMIT_VERSIONS versions in above list -AUTH_USER_LIMIT_VERSIONS="${AUTH_USER_LIMIT_VERSIONS:-3}" +AUTH_USER_LIMIT_VERSIONS="${AUTH_USER_LIMIT_VERSIONS:-2}" AUTH_USER_LIMIT=$((LATEST+AUTH_USER_LIMIT_VERSIONS*3)) # Students licenses only last a year, hence $NON_AUTH_USER_LIMIT_VERSIONS cannot be more than 2. @@ -87,13 +87,20 @@ for version in "${versions[@]}"; do echo " - Student: $ON_STUDENT" echo " - Ubuntu: $ON_UBUNTU" - # Early exiting if on Ubuntu only + # Skipping if on Ubuntu only if [[ "$ON_UBUNTU" != "true" && "$ONLY_UBUNTU" == "true" ]]; then echo "Skipping non-ubuntu versions" echo "" continue fi + # Skipping student versions on auth_user + if [[ "$auth_user" == "true" && "$ON_STUDENT" == "true"]]; then + echo "Skipping student versions when user is authenticated" + echo "" + continue + fi + # main logic if [[ "$auth_user" == "true" ]]; then if [[ "$extended_testing" == "true" ]]; then From a7253fb230c96f4dcdd87224dcd29330ce04d6f9 Mon Sep 17 00:00:00 2001 From: pyansys-ci-bot <92810346+pyansys-ci-bot@users.noreply.github.com> Date: Thu, 21 Nov 2024 20:02:58 +0000 Subject: [PATCH 2/3] chore: adding changelog file 3564.maintenance.md [dependabot-skip] --- doc/changelog.d/3564.maintenance.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/changelog.d/3564.maintenance.md diff --git a/doc/changelog.d/3564.maintenance.md b/doc/changelog.d/3564.maintenance.md new file mode 100644 index 0000000000..84a3b529b3 --- /dev/null +++ b/doc/changelog.d/3564.maintenance.md @@ -0,0 +1 @@ +ci: skipping student versions when user is authenticated \ No newline at end of file From 9f17a2e6be14c0d476912883ff1035f6ca3df111 Mon Sep 17 00:00:00 2001 From: German <28149841+germa89@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:07:39 +0100 Subject: [PATCH 3/3] fix: missing space --- .ci/build_matrix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/build_matrix.sh b/.ci/build_matrix.sh index b1d718be85..8045341a18 100755 --- a/.ci/build_matrix.sh +++ b/.ci/build_matrix.sh @@ -95,7 +95,7 @@ for version in "${versions[@]}"; do fi # Skipping student versions on auth_user - if [[ "$auth_user" == "true" && "$ON_STUDENT" == "true"]]; then + if [[ "$auth_user" == "true" && "$ON_STUDENT" == "true" ]]; then echo "Skipping student versions when user is authenticated" echo "" continue