From 494b6d56e6f3fc571dd68ff9f0e09e162d36b3c3 Mon Sep 17 00:00:00 2001
From: Ruud Senden <8635138+rsenden@users.noreply.github.com>
Date: Thu, 13 Jul 2023 12:04:41 +0200
Subject: [PATCH] chore: Fixes for functional test workflow

---
 .github/workflows/functional-tests.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/functional-tests.yml b/.github/workflows/functional-tests.yml
index 503048d78d..2a61a1c323 100644
--- a/.github/workflows/functional-tests.yml
+++ b/.github/workflows/functional-tests.yml
@@ -49,22 +49,24 @@ jobs:
       - name: Run Tests
         shell: bash
         run: |
+          mv artifact/release-assets/* .
+          mv artifact/fcli-ftest.jar .
           case "${{ matrix.type }}" in
             "java" )
               java -jar -Dft.fcli=build fcli-ftest.jar ;;
             "jar" )
-              java -jar -Dft.fcli=$(pwd)/release-assets/fcli.jar fcli-ftest.jar ;;
+              java -jar -Dft.fcli=fcli.jar fcli-ftest.jar ;;
             "native" )
               case "${{ matrix.os }}" in
                 "ubuntu-latest" ) 
-                  tar -zxvf release-assets/fcli-linux.tgz
-                  java -jar -Dft.fcli=$(pwd)/fcli fcli-ftest.jar ;;
+                  tar -zxvf fcli-linux.tgz
+                  java -jar -Dft.fcli=./fcli fcli-ftest.jar ;;
                 "windows-latest" )
-                  7z e release-assets/fcli-windows.zip
-                  java -jar -Dft.fcli=$(pwd)/fcli.exe fcli-ftest.jar ;;
+                  7z e fcli-windows.zip
+                  java -jar -Dft.fcli=fcli.exe fcli-ftest.jar ;;
                 "macos-latest" )
-                  tar -zxvf release-assets/fcli-mac.tgz
-                  ./gradlew ftest -Dft.fcli=$(pwd)/fcli ;;
+                  tar -zxvf fcli-mac.tgz
+                  ./gradlew ftest -Dft.fcli=./fcli ;;
               esac ;;
           esac