Merge pull request #163 from robinostlund/development

cleanup

.github/workflows/publish.yaml

@@ -3,21 +3,22 @@ name: Publish
 on:
   push:
     branches:
-      - masterrr
+      - master
 
 jobs:
   build:
-    name: Publish New Tag
+    name: Create Release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Bump version and push tag
-        uses: anothrNick/[email protected]
+      - name: Create Release
+        id: create_release
+        uses: release-drafter/release-drafter@v5
         env:
-          GITHUB_TOKEN: ${{ secrets.MY_PERSONAL_ACCESS_TOKEN }}
-          DEFAULT_BUMP: patch
-          WITH_V: true
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+

.github/workflows/release.yaml

@@ -1,46 +1,30 @@
 name: Release
 
-# on:
-#   push:
-#     tags:
-#       - 'v*'
 on:
-  push:
-    branches:
-      - master
+  release:
+    types: [published]
 
 jobs:
   build:
-    #name: Upload Release Asset
-    name: Create Release
+    name: Upload Assets
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Create Release
-        id: create_release
-        uses: release-drafter/release-drafter@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      # - name: Create Release Asset
-      #   run: |
-      #     cd custom_components/volkswagencarnet
-      #     zip volkswagencarnet.zip -r ./
-
-      # - name: Upload Release Asset
-      #   id: upload-release-asset 
-      #   uses: actions/[email protected]
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #   with:
-      #     release_id: ${{ steps.create_release.outputs.id }}
-      #     upload_url: ${{ steps.create_release.outputs.upload_url }}
-      #     asset_path: ./custom_components/volkswagencarnet/volkswagencarnet.zip
-      #     asset_name: volkswagencarnet.zip
-      #     asset_content_type: application/zip
+      - name: Create zip
+        run: |
+          cd custom_components/volkswagencarnet
+          zip volkswagencarnet.zip -r ./
 
+      - name: Upload zip to release
+        uses: svenstaro/upload-release-action@v1-release
 
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ./custom_components/volkswagencarnet/volkswagencarnet.zip
+          asset_name: volkswagencarnet.zip
+          tag: ${{ github.ref }}
+          overwrite: true