From 8a28bd24dd53bd506eca91e300c3085de7f40409 Mon Sep 17 00:00:00 2001
From: Tom-Oliver Heidel <github@tom-oliver.eu>
Date: Wed, 23 Sep 2020 04:59:58 +0200
Subject: [PATCH] [skip travis] publish right after unix build

---
 .github/workflows/build.yml | 41 ++++++++++++-------------------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 089469095..669b41b15 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,7 +6,7 @@ on:
       - release
 
 jobs:
-  build_unix:
+  build_unix_and_deploy_pypi:
 
     runs-on: ubuntu-latest
 
@@ -58,6 +58,18 @@ jobs:
       env:
         SHA2: ${{ hashFiles('youtube-dlc') }}
       run: echo "::set-output name=sha2_unix::${env:SHA2}"
+    - name: Install dependencies for pypi
+      run: |
+        python -m pip install --upgrade pip
+        pip install setuptools wheel twine
+    - name: Build and publish
+      env:
+        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+      run: |
+        rm -rf dist/*
+        python setup.py sdist bdist_wheel
+        twine upload dist/*
 
   build_windows:
 
@@ -137,30 +149,3 @@ jobs:
         echo "$SHA2_WINDOWS youtube-dlc.exe" > SHA2-256SUMS
         echo "$SHA2_WINDOWS32 youtube-dlc32.exe" > SHA2-256SUMS
         echo "$SHA2_UNIX youtube-dlc" >> SHA2-256SUMS
-
-  deploy:
-
-    runs-on: ubuntu-latest
-    
-    needs: build_unix
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine
-    - name: Bump version
-      run: python scripts/update-version-workflow.py
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run: |
-        rm -rf dist/*
-        python setup.py sdist bdist_wheel
-        twine upload dist/*