Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test merge back 2 #34

Open
wants to merge 11 commits into
base: test_merge
Choose a base branch
from
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: CI

on:
push:
branches: ["master"]
branches: ["master", "patch"]
pull_request:
branches: ["master"]
branches: ["master", "patch"]
workflow_dispatch: # to allow manual re-runs

env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: "CodeQL checks"

on:
push:
branches: [ master ]
branches: [ "master", "patch" ]
pull_request:
branches: [ master ]
branches: [ master, "patch" ]
schedule:
- cron: '44 17 * * 3'

Expand Down
Loading