diff options
| author | Konstantin Pavlov <thresh@nginx.com> | 2024-12-19 10:23:57 -0800 |
|---|---|---|
| committer | Konstantin Pavlov <thresh@nginx.com> | 2024-12-19 10:23:57 -0800 |
| commit | d8acad350a52a20918c46c09cb0a0f5479400923 (patch) | |
| tree | 7d9c4b64daa60d3ac121743dfa3735c6fc5687a4 /.github/workflows/ci.yml | |
| parent | 624debcf17ea7faab01fa841bd4dcd9f308cf306 (diff) | |
| parent | 27bde184dedcbf687db2f314c60c037623318a8d (diff) | |
| download | unit-1.34.0-1.tar.gz unit-1.34.0-1.tar.bz2 | |
Merge tag '1.34.0' into packaging1.34.0-1
Unit 1.34.0 release.
Diffstat (limited to '')
| -rw-r--r-- | .github/workflows/ci.yml | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f9bc699..03209406 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,8 +48,6 @@ jobs: os: ubuntu-latest - build: perl os: ubuntu-latest - - build: php-8.1 - os: ubuntu-latest - build: php-8.2 os: ubuntu-latest - build: php-8.3 @@ -101,12 +99,18 @@ jobs: # https://github.com/actions/runner-images/issues/2821 - name: Kill mono process run: | - sudo systemctl stop mono-xsp4.service - sudo systemctl mask mono-xsp4.service - sudo systemctl status mono-xsp4.service || true - PID=$(sudo lsof -t -i :8084) - echo "Killing PID $PID" - sudo kill -9 $PID + set +e + sudo systemctl status mono-xsp4.service + if [ $? -ne 0 ]; then + true + else + sudo systemctl stop mono-xsp4.service + sudo systemctl mask mono-xsp4.service + sudo systemctl status mono-xsp4.service + PID=$(sudo lsof -t -i :8084) + echo "Killing PID $PID" + sudo kill -9 $PID + fi ## ## njs @@ -354,18 +358,15 @@ jobs: - name: Install pytest run: | - if [ "${{ matrix.build }}" == "wasm-wasi-component" ]; then - pip install pytest - else - sudo -H pip install pytest - fi + sudo apt install -y python3-pytest + if: steps.metadata.outputs.module != 'wasm' - name: Run ${{ steps.metadata.outputs.module }} tests run: | if [ "${{ matrix.build }}" == "wasm-wasi-component" ]; then - pytest --print-log ${{ steps.metadata.outputs.testpath }} + pytest-3 --print-log ${{ steps.metadata.outputs.testpath }} else - sudo -E pytest --print-log ${{ steps.metadata.outputs.testpath }} + sudo -E pytest-3 --print-log ${{ steps.metadata.outputs.testpath }} fi if: steps.metadata.outputs.module != 'wasm' |