From 02e3d06bcb5009f8a2d7a6988df4781263dcd472 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Sun, 5 Dec 2021 18:31:36 -0600
Subject: [PATCH] Remove promote-release.sh from Release process (#958)

---
 .github/workflows/release.yml | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7e4e259a..40d4fcb4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,12 +4,12 @@ on:
   # workflow_dispatch:
   #  inputs:
 
-  # Only want to be run if a new tag starting with v is pushed.
+  # Only want to run if version.properties is bumped in master
   push:
     branches:
-      - "!*"
-    tags:
-      - "v1*"
+      - master
+    paths:
+    - 'version.properties'
 
 jobs:
   release-build:
@@ -21,19 +21,15 @@ jobs:
       with:
         submodules: 'recursive'
 
-    # get github branch and tag names as ${{ steps.branch_name.outputs.SOURCE_TAG }}
-    - name: Branch name
-      id: branch_name
-      run: |
-        echo ::set-output name=SOURCE_NAME::${GITHUB_REF#refs/*/}
-        echo ::set-output name=SOURCE_BRANCH::${GITHUB_REF#refs/heads/}
-        echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
-
     - name: Setup Python
       uses: actions/setup-python@v2
       with:
         python-version: 3.x
-
+        
+    # Will be available in steps.version.outputs.version	
+    - name: Get release version string
+      run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+      id: version
     # Note: we don't use caches on release builds because we don't want to accidentally not have a virgin build machine
 
     - name: Upgrade python tools
@@ -60,11 +56,6 @@ jobs:
         tar -xf build.tar -C data/static
         rm build.tar
 
-    # Will be available in steps.version.outputs.version
-    - name: Get version string
-      run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
-      id: version
-
     - name: Build everything
       run: bin/build-all.sh
 
@@ -75,8 +66,7 @@ jobs:
         draft: true
         prerelease: true
         release_name: ${{ steps.version.outputs.version }} alpha
-        tag_name: ${{ steps.branch_name.outputs.SOURCE_TAG }}
-        # was ${{ github.ref }}
+        tag_name: v${{ steps.version.outputs.version }}
         body: |
           Autogenerated by github action, developer should edit as required before publishing...
       env:
@@ -100,4 +90,4 @@ jobs:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
         asset_path: release/archive/elfs-${{ steps.version.outputs.version }}.zip
         asset_name: debug-elfs-${{ steps.version.outputs.version }}.zip
-        asset_content_type: application/zip        
\ No newline at end of file
+        asset_content_type: application/zip