From 089a2dc2065c9c6340721af1da98e40bee6730e0 Mon Sep 17 00:00:00 2001
From: Lev <mail@vrslev.com>
Date: Sat, 6 Nov 2021 21:07:39 +0300
Subject: [PATCH] build: Fix stable builds (#546)

---
 .github/scripts/get-latest-tags.sh |  4 ++++
 .github/workflows/build_stable.yml | 16 ++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/scripts/get-latest-tags.sh b/.github/scripts/get-latest-tags.sh
index 809b2120..0ca74acb 100755
--- a/.github/scripts/get-latest-tags.sh
+++ b/.github/scripts/get-latest-tags.sh
@@ -16,3 +16,7 @@ ERPNEXT_VERSION=$(get_tag frappe/erpnext "$VERSION")
 echo "FRAPPE_VERSION=$FRAPPE_VERSION" >>$GITHUB_ENV
 # shellcheck disable=SC2086
 echo "ERPNEXT_VERSION=$ERPNEXT_VERSION" >>$GITHUB_ENV
+# shellcheck disable=SC2086
+echo "GIT_BRANCH=version-$VERSION" >>$GITHUB_ENV
+# shellcheck disable=SC2086
+echo "VERSION=$VERSION" >>$GITHUB_ENV
diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml
index 399ab42a..e933b29b 100644
--- a/.github/workflows/build_stable.yml
+++ b/.github/workflows/build_stable.yml
@@ -42,11 +42,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Get latest versions
-        run: |
-          ./.github/scripts/get-latest-tags.sh
-          echo "VERSION=$VERSION" >>$GITHUB_ENV
-          echo "GIT_TAG=$FRAPPE_VERSION" >>$GITHUB_ENV
-          echo "GIT_BRANCH=version-$VERSION" >>$GITHUB_ENV
+        run: ./.github/scripts/get-latest-tags.sh
         env:
           VERSION: ${{ matrix.version }}
 
@@ -67,6 +63,8 @@ jobs:
           files: docker-bake.hcl
           targets: frappe-stable
           push: true
+        env:
+          GIT_TAG: ${{ env.FRAPPE_VERSION }}
 
   build_erpnext:
     name: ERPNext
@@ -91,11 +89,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Get latest versions
-        run: |
-          ./.github/scripts/get-latest-tags.sh
-          echo "VERSION=$VERSION" >>$GITHUB_ENV
-          echo "GIT_TAG=$ERPNEXT" >>$GITHUB_ENV
-          echo "GIT_BRANCH=version-$VERSION" >>$GITHUB_ENV
+        run: ./.github/scripts/get-latest-tags.sh
         env:
           VERSION: ${{ matrix.version }}
 
@@ -116,6 +110,8 @@ jobs:
           files: docker-bake.hcl
           targets: erpnext-stable
           push: true
+        env:
+          GIT_TAG: ${{ env.ERPNEXT_VERSION }}
 
   release_helm:
     name: Release Helm