Merge pull request #163 from matentzn/odk130

Migration to ODK 1.3.0
ZFIN · Mar 15, 2022 · dc76ef8 · dc76ef8
2 parents d6878c4 + abd8979
commit dc76ef8
Show file tree

Hide file tree

Showing 6 changed files with 223 additions and 126 deletions.
diff --git a/.github/workflows/qc.yml b/.github/workflows/qc.yml
@@ -6,9 +6,9 @@ name: CI
 on:
   # Triggers the workflow on push or pull request events but only for the main branch
   push:
-    branches: [ main ]
+    branches: [ master ]
   pull_request:
-    branches: [ main ]
+    branches: [ master ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -19,7 +19,7 @@ jobs:
   ontology_qc:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
-    container: obolibrary/odkfull:v1.2.31
+    container: obolibrary/odkfull:v1.3.0
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -28,6 +28,6 @@ jobs:
 
       - name: Run ontology QC checks
         env:
-          DEFAULT_BRANCH: main
+          DEFAULT_BRANCH: master
         run: cd src/ontology && make ROBOT_ENV='ROBOT_JAVA_ARGS=-Xmx6G' test IMP=false PAT=false