From 773700c1acd5f9820992f6482cc49d122bc6da32 Mon Sep 17 00:00:00 2001 From: cbellot Date: Fri, 4 Mar 2022 10:48:50 +0100 Subject: [PATCH 01/11] use action --- .github/workflows/ci.yml | 42 +++++++++------------------------------- 1 file changed, 9 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a2280ba9cb..9db744c5151 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,22 +31,19 @@ jobs: with: python-version: 3.8 - - name: Clone dpf-standalone - run: | - git clone https://${{secrets.DPF_PIPELINE}}@github.com/ansys-dpf/dpf-standalone + - id: install-dpf + uses: github/pydpf-action/install-dpf-server@v0 + with: + dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} + ANSYS_VERSION : ${{env.ANSYS_VERSION}} - name: Set AWP_ROOT$env:ANSYS_VERSION - run: echo "AWP_ROOT$env:ANSYS_VERSION=${{github.workspace}}\dpf-standalone/v$env:ANSYS_VERSION" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append + run: | + echo AWP_ROOT$env:ANSYS_VERSION + echo "AWP_ROOT$env:ANSYS_VERSION=${{github.workspace}}\dpf-standalone/v$env:ANSYS_VERSION" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append - name: Set SERVER - run: echo "SERVER=$env:AWP_ROOT221" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append - - - name: Extract standalone zip - run: | - ls - cd dpf-standalone - 7z x v$env:ANSYS_VERSION.7z - ls v$env:ANSYS_VERSION + run: echo "SERVER=${{ steps.install-dpf.outputs.SERVER }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append - name: Install ansys-dpf-core shell: cmd @@ -59,27 +56,6 @@ jobs: pip install %WHEELPATH% python -c "from ansys.dpf import core; print(core.Report(gpu=False))" - - name: Start DPF Server - run: | - cd $env:SERVER\aisol\bin\winx64 - ls . - Start-Process -FilePath "./Ans.Dpf.Grpc.bat" -ArgumentList "--address 127.0.0.1 --port $env:DPF_PORT" -RedirectStandardOutput "log.txt" - python -c "from ansys.dpf import core; core.connect_to_server(port=$env:DPF_PORT); print('Python Connected')" - timeout-minutes: 1 - - - name: Kill all servers - shell: cmd - run: | - tasklist /FI "IMAGENAME eq Ans.Dpf.Grpc.exe" 2>NUL | find /I /N "Ans.Dpf.Grpc.exe">NUL - ECHO %ERRORLEVEL% - if "%ERRORLEVEL%"=="0"(taskkill /f /im Ans.Dpf.Grpc.exe) - continue-on-error: true - - - name: Show DPF Server Logs - run: Get-Content -Path $env:SERVER\aisol\bin\winx64\log.txt - continue-on-error: true - if: always() - - name: WHEEL publish artifacts uses: actions/upload-artifact@v2 with: From d17b5c730022c85073d12e7bf2406e467313808e Mon Sep 17 00:00:00 2001 From: cbellot Date: Fri, 4 Mar 2022 10:52:57 +0100 Subject: [PATCH 02/11] try --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9db744c5151..42b885f03ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: python-version: 3.8 - id: install-dpf - uses: github/pydpf-action/install-dpf-server@v0 + uses: actions/pydpf-actions/install-dpf-server@v0 with: dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} ANSYS_VERSION : ${{env.ANSYS_VERSION}} From c716dabbca6ba2e400f1019057270533f3364f97 Mon Sep 17 00:00:00 2001 From: cbellot Date: Fri, 4 Mar 2022 10:56:38 +0100 Subject: [PATCH 03/11] try --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42b885f03ec..d6f4bc32cce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: python-version: 3.8 - id: install-dpf - uses: actions/pydpf-actions/install-dpf-server@v0 + uses: pydpf-actions/install-dpf-server@v0 with: dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} ANSYS_VERSION : ${{env.ANSYS_VERSION}} @@ -149,6 +149,8 @@ jobs: env: ANSYS_VERSION: 221 + condition: false + steps: - uses: actions/checkout@v2 From 98514921db21a8ca38e6ff5dd1b231dfe8f34066 Mon Sep 17 00:00:00 2001 From: cbellot Date: Fri, 4 Mar 2022 10:57:37 +0100 Subject: [PATCH 04/11] try --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d6f4bc32cce..87478f45b8a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -149,7 +149,7 @@ jobs: env: ANSYS_VERSION: 221 - condition: false + if: false steps: - uses: actions/checkout@v2 From f0498363f63ec6b68e2b0f0c35d200e31bcd7e0c Mon Sep 17 00:00:00 2001 From: cbellot Date: Fri, 4 Mar 2022 10:57:37 +0100 Subject: [PATCH 05/11] try --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d6f4bc32cce..ca2906beb21 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: python-version: 3.8 - id: install-dpf - uses: pydpf-actions/install-dpf-server@v0 + uses: actions/pyansys/pydpf-actions/install-dpf-server@v0 with: dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} ANSYS_VERSION : ${{env.ANSYS_VERSION}} @@ -149,7 +149,7 @@ jobs: env: ANSYS_VERSION: 221 - condition: false + if: false steps: - uses: actions/checkout@v2 From 9f7b0e7bfc9c656e7a3f64eeee37a9158f914955 Mon Sep 17 00:00:00 2001 From: Camille Bellot <80476446+cbellot000@users.noreply.github.com> Date: Fri, 4 Mar 2022 11:05:24 +0100 Subject: [PATCH 06/11] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca2906beb21..c025e7e1d00 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: python-version: 3.8 - id: install-dpf - uses: actions/pyansys/pydpf-actions/install-dpf-server@v0 + uses: pyansys/pydpf-actions/install-dpf-server@v0 with: dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} ANSYS_VERSION : ${{env.ANSYS_VERSION}} @@ -283,4 +283,4 @@ jobs: git remote add origin https://${{secrets.PYANSYS_CI_BOT_TOKEN}}@github.com/pyansys/DPF-Core-docs git push -u origin $env:GH_DOC_BRANCH --force env: - GH_DOC_BRANCH: gh-pages \ No newline at end of file + GH_DOC_BRANCH: gh-pages From 6003851daa83509d3addcbc8e6437c60f0b046d1 Mon Sep 17 00:00:00 2001 From: cbellot Date: Fri, 4 Mar 2022 11:21:04 +0100 Subject: [PATCH 07/11] try --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca2906beb21..3777c343241 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: with: python-version: 3.8 - - id: install-dpf + - id: install-dpf uses: actions/pyansys/pydpf-actions/install-dpf-server@v0 with: dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} From 788a91518dd8d3fe03d7935e3a2f5c6090e23bb0 Mon Sep 17 00:00:00 2001 From: cbellot Date: Fri, 4 Mar 2022 14:04:41 +0100 Subject: [PATCH 08/11] use action --- .github/workflows/ci.yml | 45 +++++++--------------------------------- 1 file changed, 7 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce9e1207a9b..304aaafca32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,10 +40,7 @@ jobs: - name: Set AWP_ROOT$env:ANSYS_VERSION run: | echo AWP_ROOT$env:ANSYS_VERSION - echo "AWP_ROOT$env:ANSYS_VERSION=${{github.workspace}}\dpf-standalone/v$env:ANSYS_VERSION" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append - - - name: Set SERVER - run: echo "SERVER=${{ steps.install-dpf.outputs.SERVER }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append + echo "AWP_ROOT$env:ANSYS_VERSION=${{ steps.install-dpf.outputs.SERVER }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append - name: Install ansys-dpf-core shell: cmd @@ -149,8 +146,6 @@ jobs: env: ANSYS_VERSION: 221 - if: false - steps: - uses: actions/checkout@v2 @@ -159,23 +154,18 @@ jobs: with: python-version: 3.8 - - name: Clone dpf-standalone - run: | - git clone https://${{secrets.DPF_PIPELINE}}@github.com/ansys-dpf/dpf-standalone + - id: install-dpf + uses: pyansys/pydpf-actions/install-dpf-server@v0 + with: + dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} + ANSYS_VERSION : ${{env.ANSYS_VERSION}} - name: Set AWP_ROOT$env:ANSYS_VERSION - run: echo "AWP_ROOT$env:ANSYS_VERSION=${{github.workspace}}\dpf-standalone/v$env:ANSYS_VERSION" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append + run: echo "AWP_ROOT$env:ANSYS_VERSION=${{ steps.install-dpf.outputs.SERVER }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append - name: Set SERVER run: echo "SERVER=$env:AWP_ROOT221" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append - - name: Extract standalone zip - run: | - ls - cd dpf-standalone - 7z x v$env:ANSYS_VERSION.7z - ls v$env:ANSYS_VERSION - - name: Install ansys-dpf-core shell: cmd run: | @@ -187,27 +177,6 @@ jobs: pip install %WHEELPATH% python -c "from ansys.dpf import core; print(core.Report(gpu=False))" - - name: Start DPF Server - run: | - cd $env:SERVER\aisol\bin\winx64 - ls . - Start-Process -FilePath "./Ans.Dpf.Grpc.bat" -ArgumentList "--address 127.0.0.1 --port $env:DPF_PORT" -RedirectStandardOutput "log.txt" -NoNewWindow - python -c "from ansys.dpf import core; core.connect_to_server(port=$env:DPF_PORT); print('Python Connected')" - timeout-minutes: 1 - - - name: Kill all servers - shell: cmd - run: | - tasklist /FI "IMAGENAME eq Ans.Dpf.Grpc.exe" 2>NUL | find /I /N "Ans.Dpf.Grpc.exe">NUL - ECHO %ERRORLEVEL% - if "%ERRORLEVEL%"=="0"(taskkill /f /im Ans.Dpf.Grpc.exe) - continue-on-error: true - - - name: Show DPF Server Logs - run: Get-Content -Path $env:SERVER\aisol\bin\winx64\log.txt - continue-on-error: true - if: always() - - name: Install OpenGL run: | Set-StrictMode -Version Latest From 110c7294a164a7d4aa644e8fd6b51c110918c199 Mon Sep 17 00:00:00 2001 From: Camille Bellot <80476446+cbellot000@users.noreply.github.com> Date: Fri, 4 Mar 2022 14:24:28 +0100 Subject: [PATCH 09/11] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 304aaafca32..7b8a6395545 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: with: python-version: 3.8 - - id: install-dpf + - id: install-dpf uses: pyansys/pydpf-actions/install-dpf-server@v0 with: dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} From 2f9834645763d00c38c76be3bab1011be2dd349c Mon Sep 17 00:00:00 2001 From: Camille Bellot <80476446+cbellot000@users.noreply.github.com> Date: Fri, 4 Mar 2022 14:26:45 +0100 Subject: [PATCH 10/11] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b8a6395545..304aaafca32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: with: python-version: 3.8 - - id: install-dpf + - id: install-dpf uses: pyansys/pydpf-actions/install-dpf-server@v0 with: dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} From fdbd64c71c0fa9cf5673f20feb1a5b53764fd69a Mon Sep 17 00:00:00 2001 From: cbellot Date: Fri, 4 Mar 2022 14:53:00 +0100 Subject: [PATCH 11/11] use released version --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 304aaafca32..feefd5dd7c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: python-version: 3.8 - id: install-dpf - uses: pyansys/pydpf-actions/install-dpf-server@v0 + uses: pyansys/pydpf-actions/install-dpf-server@v1 with: dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} ANSYS_VERSION : ${{env.ANSYS_VERSION}} @@ -155,7 +155,7 @@ jobs: python-version: 3.8 - id: install-dpf - uses: pyansys/pydpf-actions/install-dpf-server@v0 + uses: pyansys/pydpf-actions/install-dpf-server@v1 with: dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} ANSYS_VERSION : ${{env.ANSYS_VERSION}}