Skip to content

Commit 6805563

Browse files
committed
Merge remote-tracking branch 'origin/zhanqun/del-server2'
2 parents 9995bbb + 6dab3a8 commit 6805563

File tree

14 files changed

+11
-13933
lines changed

14 files changed

+11
-13933
lines changed

.github/workflows/ci_cd.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,10 @@ jobs:
6262
docker pull ghcr.io/ansys/dpf-core:22.2dev
6363
docker run -d --name dpfserver -p 50054:50052 ghcr.io/ansys/dpf-core:22.2dev && echo "DPF Server active on port 50054."
6464
65-
- name: Run server
65+
- name: LS-DYNA Keyword server activation
6666
run: |
67-
cd src/ansys/dyna/core/pre/Server
68-
python kwserver.py > server_output_docs.txt &
69-
sleep 10
70-
cd -
67+
docker pull ghcr.io/ansys/ls-pre:latest
68+
docker run -d --name kw_server -p 50051:50051 ghcr.io/ansys/ls-pre:latest && echo "Keyword server active on port 50051."
7169
7270
- name: Build the documentation (HTML)
7371
run: |
@@ -90,14 +88,19 @@ jobs:
9088
name: documentation-pdf
9189
path: doc/_build/latex/*.pdf
9290
retention-days: 7
91+
92+
- name: Extract the server logs
93+
if: always()
94+
run: |
95+
docker logs kw_server > server_output.txt
9396
9497
- name: Upload the server logs
9598
if: always()
9699
uses: actions/upload-artifact@v3
97100
with:
98-
name: server-logs-docs
99-
path: src/ansys/dyna/core/pre/Server/server_output_docs.txt
100-
101+
name: server_output.txt
102+
path: server_output.txt
103+
101104
- name: DPF Logs (on screen)
102105
if: always()
103106
run: |

src/ansys/dyna/core/pre/Server/Dockerfile

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/ansys/dyna/core/pre/Server/__init__.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/ansys/dyna/core/pre/Server/genpyprocs.bat

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

0 commit comments

Comments
 (0)