Skip to content

Commit 940100e

Browse files
committed
Merge branch 'main' into release/0.60
2 parents 26ad7f6 + 79f8c3b commit 940100e

Some content is hidden

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

59 files changed

+4109
-1081
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- main
1111

1212
env:
13-
PYMAPDL_PORT: 32771 # default won't work on azure
13+
PYMAPDL_PORT: 21000 # default won't work on azure
1414
PYMAPDL_START_INSTANCE: FALSE
1515
PYANSYS_OFF_SCREEN: True
1616
DOCKER_PACKAGE: docker.pkg.github.com/pyansys/pymapdl/mapdl
@@ -88,6 +88,14 @@ jobs:
8888
steps:
8989
- uses: actions/checkout@v2
9090

91+
# used for documentation deployment
92+
- name: Get Bot Application Token
93+
id: get_workflow_token
94+
uses: peter-murray/workflow-application-token-action@v1
95+
with:
96+
application_id: ${{ secrets.BOT_APPLICATION_ID }}
97+
application_private_key: ${{ secrets.BOT_APPLICATION_PRIVATE_KEY }}
98+
9199
- name: Setup Python
92100
uses: actions/setup-python@v2
93101
with:
@@ -152,7 +160,6 @@ jobs:
152160
working-directory: doc
153161
run: |
154162
# Overwrite MAPDL commands section so it doesn't show up
155-
mv source/mapdl_commands/.fake source/mapdl_commands/index.rst
156163
make latex
157164
python validate_png.py # clean-up GIFs mislabeled as PNG
158165
cd build/latex
@@ -163,16 +170,18 @@ jobs:
163170
uses: actions/upload-artifact@v2
164171
with:
165172
name: PDF-Documentation
166-
path: doc/build/latex/pymapdl.pdf
173+
path: doc/build/latex/pymapdl*.pdf
167174
retention-days: 7
168175

169176
- name: Deploy
170-
uses: JamesIves/github[email protected]
171-
if: startsWith(github.ref, 'refs/tags/')
177+
if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
178+
uses: JamesIves/github[email protected]
172179
with:
173-
token: ${{ secrets.GITHUB_TOKEN }}
174-
branch: gh-pages
175-
folder: doc/build/html
180+
repository-name: pyansys/pymapdl-docs
181+
token: ${{ steps.get_workflow_token.outputs.token }}
182+
BRANCH: gh-pages
183+
FOLDER: doc/build/html
184+
CLEAN: true
176185

177186
build_test:
178187
name: Build and Unit Testing
@@ -269,4 +278,4 @@ jobs:
269278
with:
270279
files: |
271280
./**/*.whl
272-
./**/*.pdf
281+
./**/*.pdf

.github/workflows/nightly-doc-build.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,30 @@ jobs:
1212
env:
1313
DISPLAY: ':99.0'
1414
MAPDL_IMAGE: 'docker.pkg.github.com/pyansys/pymapdl/mapdl:v21.2.1'
15-
PYMAPDL_PORT: 32771 # default won't work on azure
15+
PYMAPDL_PORT: 21000 # default won't work on azure
1616
PYMAPDL_START_INSTANCE: FALSE
1717
PYANSYS_OFF_SCREEN: True
1818

1919
steps:
2020
- uses: actions/checkout@v2
2121

22+
# used for documentation deployment
23+
- name: Get Bot Application Token
24+
id: get_workflow_token
25+
uses: peter-murray/workflow-application-token-action@v1
26+
with:
27+
application_id: ${{ secrets.BOT_APPLICATION_ID }}
28+
application_private_key: ${{ secrets.BOT_APPLICATION_PRIVATE_KEY }}
29+
2230
- name: Setup Python
2331
uses: actions/setup-python@v2
2432
with:
2533
python-version: 3.8
2634

2735
- name: Install OS packages
2836
run: |
29-
sudo apt update
30-
sudo apt install libgl1-mesa-glx xvfb
37+
sudo apt-get update
38+
sudo apt-get install libgl1-mesa-glx xvfb pandoc -qy
3139
3240
- name: Install ansys-mapdl-core
3341
run: |
@@ -50,15 +58,14 @@ jobs:
5058

5159
- name: Build Documentation
5260
run: |
53-
sudo apt install pandoc -qy
5461
pip install -r requirements_docs.txt
5562
xvfb-run make -C doc html
5663
5764
- name: Deploy
5865
uses: JamesIves/[email protected]
5966
with:
6067
repository-name: pyansys/pymapdl-dev-docs
61-
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
68+
token: ${{ steps.get_workflow_token.outputs.token }}
6269
BRANCH: gh-pages
6370
FOLDER: doc/build/html
6471
CLEAN: true

.github/workflows/nightly-mapdl-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- cron: '0 4 * * *'
99

1010
env:
11-
PYMAPDL_PORT: 32771 # default won't work on azure
11+
PYMAPDL_PORT: 21000 # default won't work on azure
1212
PYMAPDL_START_INSTANCE: FALSE
1313
PYANSYS_OFF_SCREEN: True
1414

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,7 @@ tmp.out
8484
venv/
8585

8686
# Visual studio code local settings
87-
.vscode/
87+
.vscode/
88+
89+
# Pycharm local settings
90+
.idea/

.idea/.gitignore

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/pymapdl.iml

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)