Skip to content

Commit

Permalink
Fix when CI is run. (#963)
Browse files Browse the repository at this point in the history
The tests should run for every PR and when merged into the main or
`v2.x` branch. Docs should be published only when merging into `v2.x`
(for now).
  • Loading branch information
1uc authored Feb 15, 2024
1 parent f32d186 commit aa43041
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 15 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ concurrency:
on:
push:
branches:
- ci_test
- release/**
- master
- main
- v2.x
pull_request:
branches:
- master
- release/**
- main
- v2.x
paths-ignore:
- '**.md'
- '**.rst'
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/clang_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ on:
pull_request:
branches:
- master
paths-ignore:
- '**.md'
- '**.rst'
- 'doc/**'
- main
- v2.x

jobs:
Code_Format:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ on:
push:
branches:
- master
- ci_test
- release/**
- main
- v2.x
pull_request:
branches:
- master
- release/**
- main
- v2.x
paths-ignore:
- '**.md'
- '**.rst'
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ name: gh-pages
on:
push:
branches:
- master
- v2.x
pull_request:
branches:
- v2.x
- master
- main

jobs:

Expand Down Expand Up @@ -39,7 +41,7 @@ jobs:
cp -r doc/poster build/doc/html/
- name: Deploy to GitHub Pages
if: ${{ success() && github.ref == 'refs/heads/master' && github.event_name == 'push' }}
if: ${{ success() && github.ref == 'refs/heads/v2.x' && github.event_name == 'push' }}
uses: crazy-max/ghaction-github-pages@v2
with:
target_branch: gh-pages
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/version_file.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ name: HighFive Check Version File
on:
push:
branches:
- ci_test
- release/**
- master
- main
- v2.x
pull_request:
branches:
- master
- release/**
- main
- v2.x

jobs:
CheckVersion:
Expand Down

0 comments on commit aa43041

Please sign in to comment.