Skip to content

Commit

Permalink
Merge branch 'main' into fastjet-3.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
chrispap95 authored Feb 14, 2024
2 parents 0410418 + 1897631 commit 28b9f2c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@ updates:
directory: "/"
schedule:
interval: "weekly"
groups:
actions:
patterns:
- "*"
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
submodules: recursive

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
- uses: pre-commit/[email protected]
with:
extra_args: --hook-stage manual --all-files
Expand All @@ -41,7 +41,7 @@ jobs:
with:
submodules: recursive

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
CIBW_BUILD_VERBOSITY: 2

- name: Upload wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: wheelhouse/*.whl

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Build SDist
run: pipx run build --sdist

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: dist/*.tar.gz

Expand Down Expand Up @@ -68,15 +68,15 @@ jobs:
CIBW_BUILD_VERBOSITY: 2

- name: Upload wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: wheelhouse/*.whl

test_sdist:
needs: [make_sdist]
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
path: dist/
Expand All @@ -94,7 +94,7 @@ jobs:
if: github.event_name == 'release' && github.event.action == 'published'

steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
path: dist
Expand Down

0 comments on commit 28b9f2c

Please sign in to comment.