From 96ec3339a4cc810da20450a9d9e91612c2b9aad4 Mon Sep 17 00:00:00 2001
From: ldelossa <ldelossa@redhat.com>
Date: Fri, 11 Sep 2020 14:04:47 -0400
Subject: [PATCH] cicd: automated releases fixes

Signed-off-by: ldelossa <ldelossa@redhat.com>
---
 .github/workflows/main.yml            |  1 +
 .github/workflows/prepare-release.yml |  1 -
 .github/workflows/release.yml         | 19 ++++++++++++-------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1001a5f..3e1ebb9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,3 +20,4 @@ jobs:
         run: make all
       - name: perform tests
         run: go test -v ./...
+
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 407408c..cd05311 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -37,4 +37,3 @@ jobs:
           commit-message: "chore: ${{ github.event.inputs.tag }} changelog bump"
           branch: "ready-${{ github.event.inputs.tag }}"
           signoff: "gh-actions"
-
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ddc293a..5681fce 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,6 +10,7 @@ jobs:
   release:
     name: Release
     runs-on: 'ubuntu-latest'
+    container: docker.io/library/golang:1.14
     steps:
       - name: Setup
         run: |
@@ -21,6 +22,8 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
+      - name: add gox
+        run: go install github.com/mitchellh/gox
       - name: ChangeLog
         shell: bash
         run: |
@@ -36,6 +39,7 @@ jobs:
           ::set-env name=CHANGELOG::${chglog}
           .
       - name: Create Release
+        id: create_release
         uses: actions/create-release@latest
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -54,16 +58,16 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ./dist/github.com/go-jira/jira-drawin-amd64
-          asset_name: jira-drawin-amd64
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./dist/github.com/go-jira/jira-darwin-amd64
+          asset_name: jira-darwin-amd64
           asset_content_type: application/octet-stream
       - name: "Publish Linux 386"
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ github.event.release.upload_url }}
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./dist/github.com/go-jira/jira-linux-386
           asset_name: jira-linux-386
           asset_content_type: application/octet-stream
@@ -72,7 +76,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ github.event.release.upload_url }}
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./dist/github.com/go-jira/jira-linux-amd64
           asset_name: jira-linux-amd64
           asset_content_type: application/octet-stream
@@ -81,7 +85,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ github.event.release.upload_url }}
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./dist/github.com/go-jira/jira-windows-386.exe
           asset_name: jira-windows-386.exe
           asset_content_type: application/octet-stream
@@ -90,8 +94,9 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ github.event.release.upload_url }}
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./dist/github.com/go-jira/jira-windows-amd64.exe
           asset_name: jira-windows-amd64.exe
           asset_content_type: application/octet-stream
 
+