Skip to content

Commit 41087f3

Browse files
authored
Merge branch 'main' into kkuntar/pipe_example
2 parents 7891c1c + 79bc288 commit 41087f3

File tree

3 files changed

+28
-23
lines changed

3 files changed

+28
-23
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717
DOC_BUILD_SYC_VERSION: 25_2
1818
FLUENT_IMAGE_VERSION: "v25.2.0"
1919
SYC_IMAGE_VERSION: "v25.2.0"
20-
MAPDL_IMAGE_VERSION: "v25.1-ubuntu"
20+
MAPDL_IMAGE_VERSION: "v25.1-ubuntu-cicd" # TODO: update to 25.2
2121

2222
permissions: {} # Zero permissions can be granted at the workflow level if not all jobs require permissions.
2323
# As a good rule of thumb, this normally includes jobs that don't use secrets.
@@ -326,7 +326,7 @@ jobs:
326326
# extra_mem_top: 30000000
327327

328328
- name: Upload HTML Documentation
329-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
329+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
330330
with:
331331
name: documentation-html
332332
path: doc/_build/html
@@ -363,34 +363,25 @@ jobs:
363363
needs: [test, docs]
364364
runs-on: ubuntu-latest
365365
steps:
366-
- name: Release to the private PyPI repository
367-
uses: ansys/actions/release-pypi-private@c2fa7c93f6883114e0e643599431b33d29f0b13f # v10.1.4
368-
with:
369-
library-name: ${{ env.PACKAGE_NAME }}
370-
twine-username: "__token__"
371-
twine-token: ${{ secrets.PYANSYS_PYPI_PRIVATE_PAT }}
372366

373-
- name: "Release to the public PyPI repository"
374-
uses: ansys/actions/release-pypi-public@c2fa7c93f6883114e0e643599431b33d29f0b13f # v10.1.4
375-
with:
376-
library-name: ${{ env.PACKAGE_NAME }}
377-
twine-username: "__token__"
378-
twine-token: ${{ secrets.PYPI_TOKEN }}
379-
380-
# TODO: We can't use ansys/actions/release-github as it assumes PDF doc.
381-
- name: Set up Python
382-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
367+
- name: "Download the library artifacts from build-library step"
368+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
383369
with:
384-
python-version: ${{ env.MAIN_PYTHON_VERSION }}
370+
name: ${{ env.PACKAGE_NAME }}-artifacts
371+
path: ${{ env.PACKAGE_NAME }}-artifacts
385372

386-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
387-
with:
388-
persist-credentials: false
389-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
390373

391374
- name: Display structure of downloaded files
392375
run: ls -R
393376

377+
- name: "Upload artifacts to PyPI using trusted publisher"
378+
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
379+
with:
380+
repository-url: "https://upload.pypi.org/legacy/"
381+
print-hash: true
382+
packages-dir: ${{ env.PACKAGE_NAMEt }}-artifacts
383+
skip-existing: false
384+
394385
- name: "Release to GitHub"
395386
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
396387
with:

CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* [Konstantinos Giannokostas](https://github.com/giannoko)
1717
* [licui7](https://github.com/licui7)
1818
* [Maxime Rey](https://github.com/MaxJPRey)
19+
* [Muhammed Adedigba](https://github.com/moe-ad)
1920
* [Nick Marnik](https://github.com/nick-marnik)
2021
* [Oleg Chernukhin](https://github.com/ochernuk)
2122
* [radnarkhed](https://github.com/radnarkhed)

src/ansys/systemcoupling/core/client/syc_container.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,20 @@ def start_container(
9191

9292
license_server = os.getenv("ANSYSLMD_LICENSE_FILE")
9393
if license_server:
94+
# This is especially necessary in the SYC_CONTAINER_USER case
95+
# because licensing can't log to default location if user is
96+
# not the default 'root'. However it might also be useful
97+
# in other cases to help diagnose license problems as it makes
98+
# the log files accessible on host.
9499
idx = run_args.index("-e")
100+
run_args.insert(idx, f"ANSYSLC_APPLOGDIR={mounted_to}")
101+
run_args.insert(idx, "-e")
102+
# timeout settings fix some license errors we were seeing
103+
run_args.insert(idx, "ANSYSCL_TIMEOUT_RESPONSE=300")
104+
run_args.insert(idx, "-e")
105+
run_args.insert(idx, "ANSYSLI_TIMEOUT_FLEXLM=60")
106+
run_args.insert(idx, "-e")
107+
95108
run_args.insert(idx, f"ANSYSLMD_LICENSE_FILE={license_server}")
96109
run_args.insert(idx, "-e")
97110

0 commit comments

Comments
 (0)