From bb1c40c7f887ad19c411d412987a02a79e1fd8c8 Mon Sep 17 00:00:00 2001
From: mkinney <mike.kinney@gmail.com>
Date: Sun, 23 Jan 2022 13:50:49 -0800
Subject: [PATCH] Update release.yml

---
 .github/workflows/release.yml | 47 +++++++----------------------------
 1 file changed, 9 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bece672..f274751 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,6 +6,10 @@ on:
         description: "Release version (Example: 1.0.0, must match 'version' in setup.py)"
         required: true
         default: '1.0.0'
+  workflow_call:
+    outputs:
+      upload_url:
+        value: ${{ jobs.release_create.outputs.upload_url }}
 
 jobs:
   release_create:
@@ -18,21 +22,12 @@ jobs:
       with:
         draft: true
         prerelease: true
-        release_name: ${{ github.event.inputs.version}} alpha
+        release_name: ${{ github.event.inputs.version}}
         tag_name: ${{ github.event.inputs.version}}
         body: |
           Autogenerated by github action, developer should edit as required before publishing...
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        
-    - name: set upload_url
-      id: set_upload_url
-      uses: noobly314/share-data@v1
-      with:
-        share-id: release_url
-        mode: set
-        key: url
-        value: ${{ steps.create_release.outputs.upload_url }}        
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}       
 
   publish_to_pypi:
     runs-on: ubuntu-latest
@@ -108,18 +103,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.get_upload_url.outputs.data }}
+          upload_url: ${{ outputs.upload_url }}
           asset_path: dist/meshtastic_mac
           asset_name: meshtastic_mac
           asset_content_type: application/zip
-          
-      - name: get upload_url
-        id: get_upload_url
-        uses: noobly314/share-data@v1
-        with:
-          share-id: release_url
-          mode: get
-          key: url
   
   build-and-publish-ubuntu:
     runs-on: ubuntu-latest
@@ -146,19 +133,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.get_upload_url.outputs.data }}
+          upload_url: ${{ outputs.upload_url }}
           asset_path: dist/meshtastic_ubuntu
           asset_name: meshtastic_ubuntu
           asset_content_type: application/zip
 
-      - name: get upload_url
-        id: get_upload_url
-        uses: noobly314/share-data@v1
-        with:
-          share-id: release_url
-          mode: get
-          key: url
-
   build-and-publish-windows:
     runs-on: windows-latest
     needs: release_create
@@ -184,15 +163,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.get_upload_url.outputs.data }}
+          upload_url: ${{ outputs.upload_url }}
           asset_path: dist/meshtastic_windows
           asset_name: meshtastic_windows
           asset_content_type: application/zip
-          
-      - name: get upload_url
-        id: get_upload_url
-        uses: noobly314/share-data@v1
-        with:
-          share-id: release_url
-          mode: get
-          key: url