From be6e2564d6b18bf9f15b842f2e4d9d894dbfdccc Mon Sep 17 00:00:00 2001
From: Ahmad Farhat <ahmad.af.farhat@gmail.com>
Date: Sat, 6 Feb 2021 16:24:22 -0500
Subject: [PATCH] Renamed workflows and updated version code (#2516)

---
 .github/workflows/{cd-push.yml => build.push.yml}       | 8 ++++++--
 .github/workflows/{cd-release.yml => build.release.yml} | 2 +-
 .github/workflows/{ci.yml => main.yml}                  | 0
 3 files changed, 7 insertions(+), 3 deletions(-)
 rename .github/workflows/{cd-push.yml => build.push.yml} (77%)
 rename .github/workflows/{cd-release.yml => build.release.yml} (93%)
 rename .github/workflows/{ci.yml => main.yml} (100%)

diff --git a/.github/workflows/cd-push.yml b/.github/workflows/build.push.yml
similarity index 77%
rename from .github/workflows/cd-push.yml
rename to .github/workflows/build.push.yml
index ec411374..e281d7ba 100644
--- a/.github/workflows/cd-push.yml
+++ b/.github/workflows/build.push.yml
@@ -2,7 +2,7 @@ env:
   RUBY_VERSION: 2.7.2
 
 
-name: CD Push
+name: Build Push
 on:
   push:
     branches: "master"
@@ -27,6 +27,10 @@ jobs:
         with:
           length: 7
 
+      - name: Get Branch Name
+        uses: tj-actions/branch-names@v2
+        id: branch-name
+
       - name: Build and Push latest
         uses: docker/build-push-action@v2
         with:
@@ -34,4 +38,4 @@ jobs:
           tags: |
             bigbluebutton/greenlight:master
             bigbluebutton/greenlight:latest
-          build-args: version_code=${{ steps.short-sha.outputs.sha }}
+          build-args: version_code=${{ steps.branch-name.outputs.ref_branch }} (${{ steps.short-sha.outputs.sha }})
\ No newline at end of file
diff --git a/.github/workflows/cd-release.yml b/.github/workflows/build.release.yml
similarity index 93%
rename from .github/workflows/cd-release.yml
rename to .github/workflows/build.release.yml
index c335710a..f77fa761 100644
--- a/.github/workflows/cd-release.yml
+++ b/.github/workflows/build.release.yml
@@ -2,7 +2,7 @@ env:
   RUBY_VERSION: 2.7.2
 
 
-name: CD Release
+name: Build Release
 on:
   release:
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/main.yml
similarity index 100%
rename from .github/workflows/ci.yml
rename to .github/workflows/main.yml