Skip to content

Commit

Permalink
Merge pull request #37 from EBISPOT/ci_update
Browse files Browse the repository at this point in the history
Fixed CI setup for main branch
  • Loading branch information
daniwelter authored Jul 24, 2023
2 parents a76a1fa + ef33eeb commit d75ea5d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:
push:
branches:
- master
- main

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/qc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ name: CI

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the master branch
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -28,7 +28,7 @@ jobs:

- name: Run ontology QC checks
env:
DEFAULT_BRANCH: master
DEFAULT_BRANCH: main
run: cd src/ontology && make ROBOT_ENV='ROBOT_JAVA_ARGS=-Xmx6G' test IMP=false PAT=false


0 comments on commit d75ea5d

Please sign in to comment.