From 0d9022639111e96421f115ed9f4fdd8ec4a7c43a Mon Sep 17 00:00:00 2001
From: Russel Waters <russel@nano.org>
Date: Fri, 20 Dec 2019 12:14:26 -0500
Subject: [PATCH] TRAVIS_TAG set for deploy-docker.sh (#2445)

* TRAVIS_TAG set for deploy-docker.sh
* build beta artifact for nix beta
* fix tags to only increment latest-including-rc on beta
---
 .github/workflows/beta_artifacts.yml | 4 ++--
 .github/workflows/live_artifacts.yml | 2 +-
 ci/actions/linux/deploy-docker.sh    | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/beta_artifacts.yml b/.github/workflows/beta_artifacts.yml
index 7a70dec41..6a1a4595e 100644
--- a/.github/workflows/beta_artifacts.yml
+++ b/.github/workflows/beta_artifacts.yml
@@ -44,7 +44,7 @@ jobs:
       - name: Fetch Deps
         run: ci/actions/linux/install_deps.sh
       - name: Build Artifact
-        run: docker run -v ${GITHUB_WORKSPACE}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && TRAVIS_TAG=${TAG} ci/build-deploy.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
+        run: docker run -v ${GITHUB_WORKSPACE}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && BETA=1 TRAVIS_TAG=${TAG} ci/build-deploy.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
       - name: Deploy Artifact
         run: ci/actions/deploy.sh
         env:
@@ -52,7 +52,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-east-2   
       - name: Deploy Docker (nanocurrency/nano-beta)
-        run: ci/actions/linux/deploy-docker.sh
+        run: TRAVIS_TAG=${TAG} ci/actions/linux/deploy-docker.sh
         env:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}     
   
diff --git a/.github/workflows/live_artifacts.yml b/.github/workflows/live_artifacts.yml
index 82539d219..6f5dfd61e 100644
--- a/.github/workflows/live_artifacts.yml
+++ b/.github/workflows/live_artifacts.yml
@@ -51,7 +51,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-east-2     
       - name: Deploy Docker (nanocurrency/nano)
-        run: ci/actions/linux/deploy-docker.sh
+        run: TRAVIS_TAG=${TAG} ci/actions/linux/deploy-docker.sh
         env:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}   
   
diff --git a/ci/actions/linux/deploy-docker.sh b/ci/actions/linux/deploy-docker.sh
index 734cb212e..4dba20bad 100755
--- a/ci/actions/linux/deploy-docker.sh
+++ b/ci/actions/linux/deploy-docker.sh
@@ -16,7 +16,10 @@ if [ -n "$DOCKER_PASSWORD" ]; then
     else
         tags=()
         if [ -n "$TRAVIS_TAG" ]; then
-            tags+=("$TRAVIS_TAG" latest latest-including-rc)
+            tags+=("$TRAVIS_TAG" latest)
+            if [[ "$GITHUB_WORKFLOW" = "Beta" ]]; then
+                tags+=(latest-including-rc)
+            fi
         elif [ -n "$TRAVIS_BRANCH" ]; then
             TRAVIS_TAG=$TRAVIS_BRANCH
             tags+=("$TRAVIS_BRANCH")