Skip to content

Commit

Permalink
Merge branch 'main' into pyproject
Browse files Browse the repository at this point in the history
  • Loading branch information
seisman committed Mar 26, 2024
2 parents b78b026 + f5a1bb1 commit 413ab9e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#
# Code lint and style checks
#
name: Check

on:
Expand All @@ -12,9 +15,6 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Cancel Previous Runs
uses: styfle/[email protected]

- name: Checkout
uses: actions/checkout@v4

Expand Down
15 changes: 12 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
#
# Build and deploy documentation
#
name: Docs

on:
push:
branches: [main]
paths:
- 'HinetPy/*.py'
- 'docs/**'
pull_request:
branches: [main]
- 'HinetPy/*.py'
- 'docs/**'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

jobs:
deploy-docs:
name: Docs
runs-on: ubuntu-latest

steps:
- name: Cancel Previous Runs
uses: styfle/[email protected]

- name: Checkout
uses: actions/checkout@v4
with:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@ name: Tests
on:
push:
branches: [main]
- 'HinetPy/**'
- 'tests/**'
- '.github/workflows/tests.yml'
pull_request:
branches: [main]
paths:
- 'HinetPy/**'
- 'tests/**'
- '.github/workflows/**'
- '.github/workflows/tests.yml'

jobs:
test:
Expand Down

0 comments on commit 413ab9e

Please sign in to comment.