Skip to content

Commit 9d04ebf

Browse files
committed
Merge branch 'main' into feat/main_commands
2 parents 72f928f + 3284272 commit 9d04ebf

File tree

92 files changed

+399
-279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+399
-279
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: 23 additions & 21 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=10 --random-order --random-order-bucket=class --maxfail=10 --reruns 3 --reruns-delay 4 --cov=ansys.mapdl.core --cov-report=html --timeout=180'
3737

38-
3938
BUILD_CHEATSHEET: True
4039
PYMAPDL_DEBUG_TESTING: True
4140

@@ -67,7 +66,7 @@ jobs:
6766
update-changelog:
6867
name: "Update CHANGELOG (on release)"
6968
if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
70-
runs-on: ubuntu-latest
69+
runs-on: ubuntu-22.04
7170
permissions:
7271
contents: write
7372
pull-requests: write
@@ -82,7 +81,7 @@ jobs:
8281
pull-request-name:
8382
if: github.event_name == 'pull_request'
8483
name: Check the name of the pull-request
85-
runs-on: ubuntu-latest
84+
runs-on: ubuntu-22.04
8685
steps:
8786
- name: Check pull-request name
8887
uses: ansys/actions/check-pr-title@v8
@@ -92,7 +91,7 @@ jobs:
9291

9392
doc-style:
9493
name: "Documentation style ${{ matrix.folder }}"
95-
runs-on: ubuntu-latest
94+
runs-on: ubuntu-22.04
9695
strategy:
9796
matrix:
9897
folder: ["doc", "examples"]
@@ -142,7 +141,7 @@ jobs:
142141

143142
check-vulnerabilities:
144143
name: "Check library vulnerabilities"
145-
runs-on: ubuntu-latest
144+
runs-on: ubuntu-22.04
146145
steps:
147146
- uses: ansys/actions/check-vulnerabilities@v8
148147
with:
@@ -156,7 +155,7 @@ jobs:
156155

157156
docs-build:
158157
name: "Build documentation"
159-
runs-on: ubuntu-latest
158+
runs-on: ubuntu-22.04
160159
needs: doc-style
161160
timeout-minutes: 60
162161
outputs:
@@ -359,7 +358,7 @@ jobs:
359358
360359
build-test-remote-matrix:
361360
name: "Build remote test matrix"
362-
runs-on: ubuntu-latest
361+
runs-on: ubuntu-22.04
363362
if: github.ref != 'refs/heads/main' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
364363
outputs:
365364
matrix: ${{ steps.set-matrix.outputs.matrix }}
@@ -396,11 +395,12 @@ 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:
402402
name: "Remote: ${{ matrix.mapdl-version }}"
403-
runs-on: ubuntu-latest
403+
runs-on: ubuntu-22.04
404404
needs: [smoke-tests, build-test-remote-matrix]
405405
timeout-minutes: 35
406406
strategy:
@@ -599,7 +599,7 @@ jobs:
599599
600600
build-test-local-minimal-matrix:
601601
name: "Build test matrix for minimal and local"
602-
runs-on: ubuntu-latest
602+
runs-on: ubuntu-22.04
603603
if: github.ref != 'refs/heads/main' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
604604
outputs:
605605
matrix: ${{ steps.set-matrix.outputs.matrix }}
@@ -630,7 +630,7 @@ jobs:
630630

631631
build-test-ubuntu-local:
632632
name: "Local: ${{ matrix.mapdl-version }}"
633-
runs-on: ubuntu-latest
633+
runs-on: ubuntu-22.04
634634
if: github.ref != 'refs/heads/main' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
635635
needs: [smoke-tests, build-test-local-minimal-matrix]
636636
timeout-minutes: 75
@@ -785,13 +785,14 @@ jobs:
785785

786786
build-test-ubuntu-minimal:
787787
name: "Local-min: ${{ matrix.mapdl-version }}"
788-
runs-on: ubuntu-latest
788+
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
@@ -913,13 +914,14 @@ jobs:
913914

914915
build-test-ubuntu-console:
915916
name: "Local-min-console: ${{ matrix.mapdl-version }}"
916-
runs-on: ubuntu-latest
917+
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
@@ -1115,7 +1117,7 @@ jobs:
11151117
package:
11161118
name: "Package library"
11171119
needs: [build-test-remote, build-test-ubuntu-local, build-test-ubuntu-minimal, docs-build]
1118-
runs-on: ubuntu-latest
1120+
runs-on: ubuntu-22.04
11191121
steps:
11201122
- name: "Build library source and wheel artifacts"
11211123
uses: ansys/actions/build-library@v8
@@ -1128,7 +1130,7 @@ jobs:
11281130
name: "Release project"
11291131
if: ${{ github.event_name == 'push' && contains(github.ref, 'refs/tags') }}
11301132
needs: [package, update-changelog]
1131-
runs-on: ubuntu-latest
1133+
runs-on: ubuntu-22.04
11321134
# Specifying a GitHub environment is optional, but strongly encouraged
11331135
environment: release
11341136
permissions:
@@ -1154,7 +1156,7 @@ jobs:
11541156
upload-docs-release:
11551157
name: "Upload release documentation"
11561158
if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
1157-
runs-on: ubuntu-latest
1159+
runs-on: ubuntu-22.04
11581160
needs: [release]
11591161
steps:
11601162
- name: "Deploy the stable documentation"
@@ -1170,7 +1172,7 @@ jobs:
11701172
upload-dev-docs:
11711173
name: "Upload dev documentation"
11721174
if: github.ref == 'refs/heads/main' && !contains(github.ref, 'refs/tags')
1173-
runs-on: ubuntu-latest
1175+
runs-on: ubuntu-22.04
11741176
needs: [docs-build]
11751177
steps:
11761178
- name: "Deploy the latest documentation"
@@ -1186,7 +1188,7 @@ jobs:
11861188
name: "Notify failed build"
11871189
needs: [smoke-tests, docs-build, build-test-remote, build-test-ubuntu-local, build-test-ubuntu-minimal]
11881190
if: failure() && github.event_name == 'schedule'
1189-
runs-on: ubuntu-latest
1191+
runs-on: ubuntu-22.04
11901192
steps:
11911193
- name: "Open issue"
11921194
uses: jayqi/failed-build-issue-action@v1

.github/workflows/linkchecker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
jobs:
2222
linkchecker:
2323
name: Check Links
24-
runs-on: ubuntu-latest
24+
runs-on: ubuntu-22.04
2525
timeout-minutes: 60
2626
env:
2727
PYMAPDL_PORT: 21000 # default won't work on GitHub runners

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,6 @@ repos:
7878

7979
# this validates our github workflow files
8080
- repo: https://github.com/python-jsonschema/check-jsonschema
81-
rev: 0.30.0
81+
rev: 0.31.0
8282
hooks:
8383
- id: check-github-workflows

doc/changelog.d/3636.miscellaneous.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/3641.added.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/3642.fixed.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/3643.added.md

Lines changed: 1 addition & 0 deletions
Lines changed: 1 addition & 0 deletions
Lines changed: 1 addition & 0 deletions

0 commit comments

Comments
 (0)