Refactor for reuse

danielpops · Apr 24, 2023 · e7dcbfd · e7dcbfd
1 parent 928a932
commit e7dcbfd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml
@@ -1,12 +1,15 @@
-name: Upload to pypi
+name: Run Tests and upload to pypi
 
 on:
   push:
     branches: [ main ]
 
 jobs:
+  tests:
+    uses: ./.github/workflows/test.yaml
   pypi-publish:
     name: Upload release to PyPI
+    needs: [tests] # require tests to pass before deploy runs
     runs-on: ubuntu-latest
     environment:
       name: pypi
@@ -15,13 +18,6 @@ jobs:
       id-token: write
     steps:
     - uses: actions/checkout@v2
-    - name: Wait for tests to succeed
-      uses: lewagon/[email protected]
-      with:
-        ref: ${{ github.action_ref }}
-        check-name: 'Run Tests'
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        wait-interval: 10
     - name: Install pypa/build
       run: python -m pip install build
     - name: Build a binary wheel and a source tarball

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -1,8 +1,6 @@
 name: Run Tests
 
 on:
-  push:
-    branches: [ main ]
   pull_request:
     branches: [ main ]
 

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setup(
     name="vault-dump",
-    version="0.0.1",
+    version="0.0.2",
     author="Daniel Popescu",
     author_email="[email protected]",
     description="A package to dump the configuration settings for a running hashicorp vault instance",