build binaries for the latest release tag

storjshare-gui/build-osx-binary.sh

@@ -20,17 +20,17 @@ tags=$(curl -H "Accept: application/json" -H "Authorization: token $GH_TOKEN" $t
 
 for ((j=0; j < $(echo $releases | jq ". | length"); j++)); do
 
-    releasename=$(echo $releases | jq --raw-output ".[$j].name")
+    releasetag=$(echo $releases | jq --raw-output ".[$j].tag_name")
 
-    if [ "$releasename" = "autobin draft release" ]; then
+    if [ "$releasetag" != "null" ]; then
         assetfound=false
         asseturl=$(echo $releases | jq --raw-output ".[$j].assets_url")
         assets=$(curl -H "Accept: application/json" -H "Authorization: token $GH_TOKEN" $asseturl)
         for ((k=0; k < $(echo $assets | jq ". | length"); k++)); do
 
             assetname=$(echo $assets | jq --raw-output ".[$k].name")
 
-            if [ "${assetname: -10}" = ".osx64.dmg" ]; then
+            if [ "${assetname: 14}" = ".osx64.dmg" ]; then
                 assetstate=$(echo $assets | jq --raw-output ".[$k].state")
                 if [ "$assetstate" = "new" ]; then
                     binaryurl=$(echo $assets | jq --raw-output ".[$k].url")
@@ -46,26 +46,14 @@ for ((j=0; j < $(echo $releases | jq ". | length"); j++)); do
             uploadurl=$(echo $releases | jq --raw-output ".[$j].upload_url")
             uploadurl=${uploadurl//\{?name,label\}/}
 
-            # existing build tag or branch
-            targetbranch=$(echo $releases | jq --raw-output ".[$j].target_commitish")
-            targettag=$(echo $releases | jq --raw-output ".[$j].tag_name")
-            if [ "$targettag" != "null" ]; then
-                for ((l=0; l < $(echo $tags | jq ". | length"); l++)); do
-                    tag=$(echo $tags | jq --raw-output ".[$l].name")
-                    if [ "$targettag" = "$tag" ]; then
-                        targetbranch=$targettag
-                    fi 
-                done
-            fi
-
             cd "$workdir"
             mkdir repos
             cd repos
 
             rm -rf $repositoryname
 
-            echo create and upload binary $repositoryurl $targetbranch
-            git clone $repositoryurl -b $targetbranch $repositoryname
+            echo create and upload binary $repositoryurl $releasetag
+            git clone $repositoryurl -b $releasetag $repositoryname
             cd $repositoryname
             npm install
             npm run release

storjshare-gui/build-windows-binary.bat

@@ -46,12 +46,12 @@ set /a pulls=!pulls!-1
 
 for /L %%J in (0, 1, !releases!) do (
 
-    type releases.json | jq --raw-output ".[%%J].name" > temp.dat
-    set /p releasename= < temp.dat
+    type releases.json | jq --raw-output ".[%%J].tag_name" > temp.dat
+    set /p releasetag= < temp.dat
     del temp.dat
 
-    rem build binaries for new draft release
-    if "!releasename!" == "autobin draft release" (
+    rem build binaries for new release tags
+    if not !releasetag! == null (
 
         set assetfound="false"
 
@@ -71,7 +71,7 @@ for /L %%J in (0, 1, !releases!) do (
             set /p assetname= < temp.dat
             del temp.dat
 
-            if "!assetname:~-10!" == "!extension!.exe" (
+            if "!assetname:~14!" == "!extension!.exe" (
 
                 type assets.json | jq --raw-output ".[%%K].state" > temp.dat
                 set /p assetstate= < temp.dat
@@ -94,42 +94,15 @@ for /L %%J in (0, 1, !releases!) do (
             set uploadurl=!uploadurl:{?name,label}=!
             del temp.dat
 
-            type releases.json | jq --raw-output ".[%%J].target_commitish" > temp.dat
-            set /p targetbranch= < temp.dat
-            del temp.dat
-
-            type releases.json | jq --raw-output ".[%%J].tag_name" > temp.dat
-            set /p targettag= < temp.dat
-            del temp.dat
-
-            if not !targettag! == null (
-
-                type tags.json | jq ". | length" > temp.dat
-                set /p tags= < temp.dat
-                del temp.dat
-                set /a tags=!tags!-1
-
-                for /L %%L in (0, 1, !tags!) do (
-
-                    type tags.json | jq --raw-output ".[%%L].name" > temp.dat
-                    set /p tag= < temp.dat
-                    del temp.dat
-
-                    if !targettag! == !tag! (
-                        set targetbranch=!targettag!
-                    )
-                )
-            )
-
             cd !workdir!
             mkdir repos
             cd repos
 
             rem delete old build files
             rmdir /S /Q !repositoryname!
 
-            echo create and upload binary !repositoryurl! !targetbranch!
-            git clone "!repositoryurl!" -b "!targetbranch!" "!repositoryname!"
+            echo create and upload binary !repositoryurl! !releasetag!
+            git clone "!repositoryurl!" -b "!releasetag!" "!repositoryname!"
             cd !repositoryname!
             cmd /c npm install
             cmd /c npm run release