diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 99d9437c..9cc2d2e0 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -7,6 +7,9 @@ on: push: branches: - main + pull_request: + branches: + - main release: types: [published] @@ -16,13 +19,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: '3.10' - run: python -m pip install build --user - run: python -m build --sdist --wheel --outdir dist/ . @@ -36,8 +39,8 @@ jobs: pip install 'mhkit[all]' --find-links dist/ python -c "from mhkit import wave, river, tidal, dolfyn, power, loads, mooring, acoustics, qc, utils; print('All modules imported successfully')" - - name: Upload to Test PyPI - if: github.event_name != 'release' && github.repository_owner == 'MHKiT-Software' + - name: Upload to Test PyPI (commits to main only) + if: github.event_name == 'push' && github.repository_owner == 'MHKiT-Software' uses: pypa/gh-action-pypi-publish@release/v1 with: user: __token__ diff --git a/.github/workflows/test-wheel-build.yml b/.github/workflows/test-wheel-build.yml index 59e316bc..8186eff5 100644 --- a/.github/workflows/test-wheel-build.yml +++ b/.github/workflows/test-wheel-build.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.10', '3.11', '3.12'] + python-version: ['3.11', '3.12'] steps: - uses: actions/checkout@v2