wip: tidy dist and try upload

CasparCG · Jan 13, 2025 · 37b4ad5 · 37b4ad5
1 parent cdf7c41
commit 37b4ad5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/linux-system.yml b/.github/workflows/linux-system.yml
@@ -80,21 +80,23 @@ jobs:
                 mv ../*.deb dist/
 
                 # TODO - collect a readme or something
-
-                zip -r "${{ steps.setup-env.outputs.BUILD_FILENAME }}.zip" dist
+                cp README.md dist/
+                cp tools/linux/deb/INSTALLING dist/
 
                 # check if a release branch, or master, or a tag
                 if [[ "${{ github.ref_name }}" == "master" || "${{ github.ref_name }}" == "2.3.x-lts" ]]
                 then
                   # Only proceed if we have an sftp password
                   if [ -n "${{ secrets.SFTP_PASSWORD }}" ]
                   then
+                    zip -r "${{ steps.setup-env.outputs.BUILD_FILENAME }}.zip" dist
+
                     # TODO - upload to website
-                    #   set -x
-                    #   eval $(ssh-agent -s)
-                    #   mkdir -v -m 700 $HOME/.ssh
-                    #   ssh-keyscan -H ${{ secrets.SFTP_HOST }} > $HOME/.ssh/known_hosts
-                    #   sshpass -p "${{ secrets.SFTP_PASSWORD }}" scp -r "${{ steps.rename-build.outputs.uploadname }}" "${{ secrets.SFTP_USERNAME }}@${{ secrets.SFTP_HOST }}:${{ secrets.SFTP_ROOT }}/${{ github.ref_name }}/${{ steps.rename-build.outputs.uploadname }}"
+                    set -x
+                    eval $(ssh-agent -s)
+                    mkdir -v -m 700 $HOME/.ssh
+                    ssh-keyscan -H ${{ secrets.SFTP_HOST }} > $HOME/.ssh/known_hosts
+                    sshpass -p "${{ secrets.SFTP_PASSWORD }}" scp -r "${{ steps.setup-env.outputs.BUILD_FILENAME }}.zip" "${{ secrets.SFTP_USERNAME }}@${{ secrets.SFTP_HOST }}:${{ secrets.SFTP_ROOT }}/${{ github.ref_name }}/${{ steps.setup-env.outputs.BUILD_FILENAME }}.zip"
                   fi
                 fi
 

diff --git a/tools/linux/launch-interactive b/tools/linux/launch-interactive