Try better

danielpops · Apr 26, 2023 · 9b87e03 · 9b87e03
1 parent 0ae11c3
commit 9b87e03
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml
@@ -1,18 +1,16 @@
 name: Run Tests and upload to pypi
 
 on:
-  push:
+  pull_request:
     branches:
       - main
-  workflow_run:
-    workflows: 
-      - "Run Tests"
+  push:
     branches:
       - main
-    types:
-      - completed
 
 jobs:
+  tests:
+    uses: ./.github/workflows/test.yaml
   debug:
     runs-on: ubuntu-latest
     steps:
@@ -25,9 +23,9 @@ jobs:
           GITHUB_CONTEXT: ${{ toJson(github) }}
         run: echo "$GITHUB_CONTEXT"
   pypi-publish:
+    if: github.event_name == 'push'
     name: Upload release to PyPI
-    #needs: [tests] # require tests to pass before deploy runs
-    #if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    needs: [tests] # require tests to pass before deploy runs
     runs-on: ubuntu-latest
     environment:
       name: pypi

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -1,13 +1,10 @@
 name: Run Tests
 
 on:
-  pull_request:
-    branches:
-      - main
+  #  pull_request:
+  #    branches:
+  #      - main
   workflow_call:
-  push:
-    branches:
-      - main
 
 jobs:
   test: