Skip to content

Commit 2c90d27

Browse files
committed
ci: simplify pipeline
Signed-off-by: Oz Tiram <[email protected]>
1 parent e1bb393 commit 2c90d27

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,13 @@ jobs:
109109
run: |
110110
cmd /c start pipenv run pypi-server run -v --host=0.0.0.0 --port=8080 --hash-algo=sha256 --disable-fallback ./tests/pypi/ ./tests/fixtures
111111
if: ${{matrix.os == 'Windows' }}
112-
- name: Run pypiserver Mac
113-
run: |
114-
pypi-server run -v --host=0.0.0.0 --port=8080 --hash-algo=sha256 --disable-fallback ./tests/pypi/ ./tests/fixtures &
115-
if: ${{matrix.os == 'MacOS' }}
116-
- name: Run pypiserver Ubuntu
112+
- name: Run pypiserver ${{ matrix.os }}
117113
run: |
114+
pipenv run pypi-server --version
118115
pypi-server --version
119116
pypi-server run -v --host=0.0.0.0 --port=8080 --hash-algo=sha256 --disable-fallback ./tests/pypi/ ./tests/fixtures &
120-
if: ${{matrix.os == 'Ubuntu' }}
117+
pipenv run pypi-server run -v --host=0.0.0.0 --port=8081 --hash-algo=sha256 --disable-fallback ./tests/pypi/ ./tests/fixtures &
118+
if: contains(matrix.os, 'Ubuntu') || contains(matrix.os, 'macOS')
121119
- name: Run tests
122120
env:
123121
PIPENV_DEFAULT_PYTHON_VERSION: ${{ matrix.python-version }}

0 commit comments

Comments
 (0)