ci/cd: use strip_components to fix up and simplify scp file transfer

siddharthvp · May 26, 2024 · 5975811 · 5975811
1 parent cf8a2a1
commit 5975811
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/.github/workflows/ci-push.yml b/.github/workflows/ci-push.yml
@@ -90,18 +90,10 @@ jobs:
       - name: Upload coverage reports to Toolforge
         uses: appleboy/scp-action@9ba62064d28ce0897a970e72cdfe30b9fde2fe48
         with:
-          source: /home/runner/work/mwn/mwn/coverage.zip
-          target: /data/project/mwn
-          host: login.toolforge.org
-          username: ${{ secrets.TOOLFORGE_USERNAME }}
-          key: ${{ secrets.TOOLFORGE_PRIVATE_KEY }}
-      - name: Coverage
-        uses: appleboy/ssh-action@551964ebda1034f0b5449d74db25c42e371ca1f7
-        with:
-          script: |
-            cd /data/project/mwn
-            rm -rf www/static/coverage
-            unzip coverage.zip -d www/static
+          source: ${{github.workspace}}/coverage/*
+          strip_components: 3
+          target: /data/project/mwn/www/static/coverage
+          rm: true
           host: login.toolforge.org
           username: ${{ secrets.TOOLFORGE_USERNAME }}
           key: ${{ secrets.TOOLFORGE_PRIVATE_KEY }}
diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml
@@ -33,6 +33,7 @@ jobs:
         uses: appleboy/scp-action@9ba62064d28ce0897a970e72cdfe30b9fde2fe48
         with:
           source: ${{github.workspace}}/website/build/docs.zip
+          strip_components: 4
           target: /data/project/mwn
           host: login.toolforge.org
           username: ${{secrets.TOOLFORGE_USERNAME}}