Skip to content

Commit 9263f27

Browse files
committed
chore: merge remote-tracking branch 'origin/main' into refactor/launcher
2 parents bebd49f + e33b5a1 commit 9263f27

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

.ci/build_matrix.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ LATEST=3 # for 'latest-ubuntu' and 'latest-ubuntu-student'
3232
# Run only ubuntu jobs
3333
ONLY_UBUNTU="${ONLY_UBUNTU:-false}"
3434

35+
# On remote
36+
ON_REMOTE="${ON_REMOTE:-false}"
37+
3538
# Do not process more than the $AUTH_USER_LIMIT_VERSIONS versions in above list
3639
AUTH_USER_LIMIT_VERSIONS="${AUTH_USER_LIMIT_VERSIONS:-2}"
3740
AUTH_USER_LIMIT=$((LATEST+AUTH_USER_LIMIT_VERSIONS*3))
@@ -97,6 +100,13 @@ for version in "${versions[@]}"; do
97100
continue
98101
fi
99102

103+
# Skipping if on remote and on student
104+
if [[ "$ON_STUDENT" == "true" && "$ON_REMOTE" == "true" ]]; then
105+
echo "Skipping student versions when running on remote"
106+
echo ""
107+
continue
108+
fi
109+
100110
# Skipping student versions on auth_user
101111
# if [[ "$auth_user" == "true" && "$ON_STUDENT" == "true" ]]; then
102112
# echo "Skipping student versions when user is authenticated"

.github/workflows/ci.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ env:
3535
ON_CI: True
3636
PYTEST_ARGUMENTS: '-vvv -rxXsa --color=yes --durations=30 --random-order --random-order-bucket=class --maxfail=10 --reruns 3 --reruns-delay 4 --cov=ansys.mapdl.core --cov-report=html --timeout=180 --profile-svg --profile'
3737

38-
3938
BUILD_CHEATSHEET: True
4039
PYMAPDL_DEBUG_TESTING: True
4140

@@ -396,6 +395,7 @@ jobs:
396395
env:
397396
extended_testing: ${{ github.event_name == 'schedule' || ( github.event_name == 'workflow_dispatch' && inputs.run_all_tests ) || ( github.event_name == 'push' && contains(github.ref, 'refs/tags') ) }}
398397
auth_user: ${{ steps.is_organization_member.outputs.isTeamMember == 'true' || github.actor == 'dependabot[bot]' }}
398+
ON_REMOTE: true
399399
run: .ci/build_matrix.sh
400400

401401
build-test-remote:
@@ -787,11 +787,12 @@ jobs:
787787
name: "Local-min: ${{ matrix.mapdl-version }}"
788788
runs-on: ubuntu-22.04
789789
if: github.ref != 'refs/heads/main' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
790-
needs: [smoke-tests, build-test-local-minimal-matrix]
790+
needs: [build-test-ubuntu-local, build-test-remote]
791791
timeout-minutes: 75
792792
strategy:
793793
fail-fast: false
794-
matrix: ${{fromJson(needs.build-test-local-minimal-matrix.outputs.matrix)}}
794+
matrix:
795+
mapdl-version: ['latest-ubuntu', 'v25.1-ubuntu']
795796
container:
796797
image: ghcr.io/ansys/mapdl:${{ matrix.mapdl-version }}
797798
options: -u=0:0 --oom-kill-disable --memory=6656MB --memory-swap=16896MB --shm-size=1gb --entrypoint /bin/bash
@@ -915,11 +916,12 @@ jobs:
915916
name: "Local-min-console: ${{ matrix.mapdl-version }}"
916917
runs-on: ubuntu-22.04
917918
if: github.ref != 'refs/heads/main' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
918-
needs: [smoke-tests, build-test-local-minimal-matrix]
919+
needs: [build-test-ubuntu-local, build-test-remote]
919920
timeout-minutes: 75
920921
strategy:
921922
fail-fast: false
922-
matrix: ${{fromJson(needs.build-test-local-minimal-matrix.outputs.matrix)}}
923+
matrix:
924+
mapdl-version: ['latest-ubuntu', 'v25.1-ubuntu']
923925
container:
924926
image: ghcr.io/ansys/mapdl:${{ matrix.mapdl-version }}
925927
options: -u=0:0 --oom-kill-disable --memory=6656MB --memory-swap=16896MB --shm-size=1gb --entrypoint /bin/bash

doc/changelog.d/3668.maintenance.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ci: skipping students version if on remote

doc/changelog.d/3669.maintenance.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ci: reducing minimal and console to two versions, and after local and remote

0 commit comments

Comments
 (0)