From 469954ff66adf4e10820acfe12ceee04029b576b Mon Sep 17 00:00:00 2001
From: Radek Jajko <radek235s@gmail.com>
Date: Mon, 8 Nov 2021 15:48:31 +0100
Subject: [PATCH] #1951 Change place where the variables are initialized

---
 .github/workflows/build.yml | 18 +++++++++---------
 version.sh                  |  3 ---
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c912d73848..9e14ecd085 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,15 +29,6 @@ jobs:
         run: mkdir -p /home/runner/tomcat; cd /home/runner/tomcat; wget https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.53/bin/apache-tomcat-9.0.53.tar.gz; tar xvzf apache-tomcat-9.0.53.tar.gz
       - name: Show Tomcat
         run: ls $CATALINA_HOME
-      - name: Get Scada-LTS latest release version
-        id: relverjava
-        uses: pozetroninc/github-action-get-latest-release@master
-        with:
-          owner: SCADA-LTS
-          repo: Scada-LTS
-      - name: Prepare Application Enviroment Version Vairables
-        working-directory: ./
-        run: ./version.sh ${{ steps.relverjava.outputs.release }} $GITHUB_RUN_ID $GITHUB_HEAD_REF $GITHUB_SHA $GITHUB_ACTOR $GITHUB_BASE_REF
       - name: Test JUnit Scada Application
         run: gradle test
       - name: Build Scada-LTS WAR Application
@@ -122,6 +113,15 @@ jobs:
         with:
           key: ${{ runner.os }}-frontend-${{ github.run_id }}
           path: ./scadalts-ui/dist
+      - name: Get Scada-LTS latest release version
+        id: relverjava
+        uses: pozetroninc/github-action-get-latest-release@master
+        with:
+          owner: SCADA-LTS
+          repo: Scada-LTS
+      - name: Prepare Application Enviroment Version Vairables
+        working-directory: ./
+        run: ./version.sh ${{ steps.relverjava.outputs.release }} $GITHUB_RUN_ID $GITHUB_HEAD_REF $GITHUB_SHA $GITHUB_ACTOR $GITHUB_BASE_REF
       - name: Install static web-dependencies
         working-directory: ./WebContent/resources
         run: npm install
diff --git a/version.sh b/version.sh
index b5cc8e3201..16ef50cba8 100755
--- a/version.sh
+++ b/version.sh
@@ -21,9 +21,6 @@ echo "Build from GitHub commit: $commit"
 echo "Initiated by: $actor"
 echo "GitHub PullRequest branch: $pullRequestBranch"
 
-pwd
-echo $versionfile
-
 sed -i "/slts.version.number=/c\slts.version.number=$milestone" $versionfile
 sed -i "/slts.version.build=/c\slts.version.build=$build" $versionfile
 sed -i "/slts.version.commit=/c\slts.version.commit=$commit" $versionfile