Skip to content

Commit

Permalink
fix the pull request stuff and while at it, do a few more updates
Browse files Browse the repository at this point in the history
  • Loading branch information
nilsnolde committed Apr 12, 2023
1 parent 4cc2157 commit 60e195f
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/publish_tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ jobs:
- image: macos-latest
platform: macos
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Configure Python
uses: actions/setup-python@v2
uses: actions/setup-python@v3

# keep in-sync with the other yaml
- name: Cache Conan (MacOS)
id: cache-conan
uses: actions/cache@v2
uses: actions/cache@v3
if: matrix.platform != 'windows'
with:
path: |
Expand Down Expand Up @@ -78,14 +78,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/setup-python@v2
- uses: actions/setup-python@v3

- uses: actions/download-artifact@v2
with:
name: artifact
path: dist

- uses: pypa/gh-action-pypi-publish@v1.4.2
- uses: pypa/gh-action-pypi-publish@v1.8.5
with:
user: nilsnolde
password: ${{ secrets.PYPI_PASS }}
7 changes: 5 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@ jobs:
name: PR - cp*, ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Configure Python
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: '3.10'

- name: Lint & Style Check
run: |
python install -r dev-requirements.txt
pre-commit run --all-files --show-diff-on-failure
- uses: pypa/cibuildwheel@v2.3.1
4 changes: 2 additions & 2 deletions .github/workflows/push_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
platform: macos

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Configure Python
uses: actions/setup-python@v2
uses: actions/setup-python@v3

# keep in-sync with the other yaml
# only macos makes sense, windows didn't work, linux installs conan inside the docker image
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/psf/black
rev: 22.8.0
rev: 23.3.0
hooks:
- id: black
language_version: python3
Expand Down
2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pre-commit==2.16.0
pre-commit==3.2.2

0 comments on commit 60e195f

Please sign in to comment.