From 6c5ac69eb0981f849bf8ae5e553e711c90ae37f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3n=20Levy?= <jon.levy@ruv.is>
Date: Sun, 21 Feb 2021 20:11:54 +0000
Subject: [PATCH] ci: mv artifacts

---
 .github/workflows/main.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 39081e9c..b808c8d6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -187,7 +187,7 @@ jobs:
       - name: Unzip build
         # greining-1/monorepo-demo/artifacts/analysis_1_build/
         run: |
-          unzip ${{needs.setup.outputs.artifact}}
+          unzip ${{needs.setup.outputs.artifact}} && mv ${{ github.workspace }}/artifacts/* ${{ github.workspace }}/
           rm ${{needs.setup.outputs.artifact}}
           ls -al .
       #----------------------------------------------
@@ -202,7 +202,7 @@ jobs:
           password: ${{ secrets.HI_PASSWORD }}
           port: 22
           rm: true
-          source: artifacts/foundation_build
+          source: foundation_build
           target: ".public_html/staging/undirbuningur_stae/${{ needs.setup.outputs.branch_name }}"
       - name: Deploy analysis-1 docs
         id: deploy_analysis_1_docs
@@ -213,7 +213,7 @@ jobs:
           password: ${{ secrets.HI_PASSWORD }}
           port: 22
           rm: true
-          source: artifacts/analysis_1_build
+          source: analysis_1_build
           target: ".public_html/staging/greining-1/${{ needs.setup.outputs.branch_name }}"
   deploy-production-branch:
     if: needs.setup.outputs.branch_name == 'master'
@@ -232,9 +232,11 @@ jobs:
       # Unzip to comply with scp-action
       #----------------------------------------------
       - name: Unzip build
+        # greining-1/monorepo-demo/artifacts/analysis_1_build/
         run: |
-          unzip ${{needs.setup.outputs.artifact}}
+          unzip ${{needs.setup.outputs.artifact}} && mv ${{ github.workspace }}/artifacts/* ${{ github.workspace }}/
           rm ${{needs.setup.outputs.artifact}}
+          ls -al .
       - name: Deploy foundation to prod
         id: deploy_foundation_prod
         uses: appleboy/scp-action@master
@@ -244,7 +246,7 @@ jobs:
           password: ${{ secrets.HI_PASSWORD }}
           port: 22
           rm: true
-          source: artifacts/foundation
+          source: foundation
           target: ".public_html/production/undirbuningur_stae/${{ needs.setup.outputs.branch_name }}"
       - name: Deploy analysis-1 to prod
         id: deploy_analysis_1_prod
@@ -255,5 +257,5 @@ jobs:
           password: ${{ secrets.HI_PASSWORD }}
           port: 22
           rm: true
-          source: artifacts/analysis_1_build
+          source: analysis_1_build
           target: ".public_html/staging/greining-1/${{ needs.setup.outputs.branch_name }}"
\ No newline at end of file