Update CI and build conditionals

talmolab · Dec 10, 2020 · 20fda38 · 20fda38
1 parent f4f0070
commit 20fda38
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,11 +1,10 @@
 # PyPI and conda package builds on release.
-# TODO: Update branch conditionals below to use develop instead of tf23 when we switch CI systems.
 name: Build
 
 on:
   # push:
-  #   branches:
-  #     - tf23
+  #   branches:  # Use this to trigger a build if the release build failed
+  #     - master
   #     - develop
 
   release:
@@ -102,8 +101,7 @@ jobs:
           anaconda -v upload "build\win-64\*.tar.bz2"
           anaconda logout
       - name: Upload conda package (Windows/dev)
-        # if: matrix.os == 'windows-2019' && github.ref == 'refs/heads/develop'
-        if: matrix.os == 'windows-2019' && github.ref == 'refs/heads/tf23'
+        if: matrix.os == 'windows-2019' && github.ref == 'refs/heads/develop'
         shell: powershell
         run: |
           anaconda -v upload "build\win-64\*.tar.bz2" --label dev
@@ -116,8 +114,7 @@ jobs:
           anaconda -v upload build/linux-64/*.tar.bz2
           anaconda logout
       - name: Upload conda package (Ubuntu/dev)
-        # if: matrix.os == 'ubuntu-18.04' && github.ref == 'refs/heads/develop'
-        if: matrix.os == 'ubuntu-18.04' && github.ref == 'refs/heads/tf23'
+        if: matrix.os == 'ubuntu-18.04' && github.ref == 'refs/heads/develop'
         shell: bash -l {0}
         run: |
           anaconda -v upload build/linux-64/*.tar.bz2 --label dev

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,10 +3,6 @@ name: CI
 
 on:
   push:
-    branches:
-      - master
-      - develop
-      - tf23
     paths:
       - 'sleap/**'
       - 'tests/**'
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,10 +3,6 @@ name: CI @@
     on:
       push:
-        branches:
-          - master
-          - develop
-          - tf23
         paths:
           - 'sleap/**'
           - 'tests/**'
@@ Expand Down @@