From 4c3fd293db9862143c93f477037bd59628794916 Mon Sep 17 00:00:00 2001
From: Vladan Popovic <vladanovic@gmail.com>
Date: Mon, 7 Sep 2020 15:42:01 +0200
Subject: [PATCH] Fix releasing wheels

---
 .github/workflows/release.yaml   | 31 +++++++++++++++++++++++--------
 .github/workflows/unittests.yaml |  9 +++++++--
 setup.cfg                        |  3 ---
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index c5d83ae..33c9dbc 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -21,15 +21,30 @@ jobs:
           python-version: ${{ matrix.python }}
       - name: Install tox
         run: pip install tox
-      - name: Create release with tox
-        id: create_release
-        run: tox -e release
-      - name: Upload Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
+      - name: Build wheel
+        id: build_wheel
+        run: |
+          tox -e release
+          echo ::set-output name=wheel_name::chweb-$(python setup.py --version)-py3-none-any.whl
+      - name: Create release
+        uses: actions/create-release@v1
+        id: release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./dist/*
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          draft: false
+          prerelease: false
+      - name: Check wheel name
+        run: echo ${{ steps.build_wheel.outputs.wheel_name }}
+      - name: Upload Release Asset
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1.0.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.release.outputs.upload_url }}
+          asset_path: ./dist/${{ steps.build_wheel.outputs.wheel_name }}
+          asset_name: ${{ steps.build_wheel.outputs.wheel_name }}
           asset_content_type: application/zip
diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml
index f781e9a..6eee510 100644
--- a/.github/workflows/unittests.yaml
+++ b/.github/workflows/unittests.yaml
@@ -2,8 +2,13 @@ name: unittests
 
 on:
   push:
-  tags-ignore:
-    - '*.*'
+    branches:
+      - '*'
+    pull_request:
+      branches:
+        - master
+    tags-ignore:
+      - '*.*'
 
 jobs:
   build:
diff --git a/setup.cfg b/setup.cfg
index f25077d..e87b134 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,6 +21,3 @@ where=src
 console_scripts =
     chweb_collect = chweb.cmd:collect
     chweb_consume = chweb.cmd:consume
-
-[bdist_wheel]
-universal = 1