From 19e356ec989ee3bb2fc05e9dceadd42ea9db4833 Mon Sep 17 00:00:00 2001
From: David Turner <dmturner@princeton.edu>
Date: Mon, 27 Nov 2023 16:19:44 -0500
Subject: [PATCH] Trigger release on push of tag

- Add trigger for release when pushing tags that start with 'v'
- Made release job depend on passing of tests for pypi and conda.

Fixes #534, fixes #535
---
 .github/workflows/main.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 897d8fed..810aa58c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,10 +1,7 @@
 on:
   pull_request:
   push:
-  release:
-    types:
-      - published
-
+  
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -69,13 +66,13 @@ jobs:
           path: ${{ steps.build-package.outputs.PACKAGE_PATH }}
 
   publish_conda:
-    needs: [conda]
+    needs: [conda, pypi]
     name: Publish to Anaconda
     environment: anaconda
     permissions:
       id-token: write
     runs-on: ubuntu-latest
-    if: github.event_name == 'release' && github.event.action == 'published'
+    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/v')
 
     steps:
       - uses: actions/download-artifact@v3
@@ -87,7 +84,6 @@ jobs:
         run: find ${{ steps.build-package.outputs.PACKAGE_PATH }} -type f -name "*.tar.bz2"
 
       - name: Upload to Anaconda
-        if: github.event_name == 'release' && github.event.action == 'published'
         run: |
           export ANACONDA_API_TOKEN=${{ secrets.ANACONDA_TOKEN }}
           find ${{ steps.build-package.outputs.PACKAGE_PATH }} -type f -name "*.tar.bz2" -exec echo "anaconda upload {}" \;
@@ -105,18 +101,18 @@ jobs:
         
   publish_pypi:
     name: Publish to PyPI
-    needs: [dist]
+    needs: [dist, pypi, conda]
     environment:
       name: pypi
       url: https://pypi.org/p/brainiak
     permissions:
       id-token: write
     runs-on: ubuntu-latest
-    if: github.event_name == 'release' && github.event.action == 'published'
+    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/v')
     steps:
       - uses: actions/download-artifact@v3
         with:
           name: Packages
           path: dist
 
-      - uses: pypa/gh-action-pypi-publish@release/v1
\ No newline at end of file
+      - uses: pypa/gh-action-pypi-publish@release/v1