diff --git a/.github/workflows/linux-system.yml b/.github/workflows/linux-system.yml index a6279a7c7c..35fdadea23 100644 --- a/.github/workflows/linux-system.yml +++ b/.github/workflows/linux-system.yml @@ -79,4 +79,14 @@ jobs: path: dist # TODO - upload to website + # - name: Copy single file to remote + # if: ${{ steps.rename-build.outputs.uploadname }} + # timeout-minutes: 5 + # shell: bash + # run: | + # 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 }}" diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 56c61dd6e5..7bf819d08e 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -19,62 +19,5 @@ jobs: - name: Run build run: | ./tools/linux/build-in-docker - ./tools/linux/extract-from-docker - env: CI: 1 - - - name: Download media-scanner - uses: robinraju/release-downloader@v1.10 - with: - repository: "casparcg/media-scanner" - latest: true - fileName: "*-linux-x64.zip" - tarBall: false - zipBall: false - out-file-path: "casparcg_server/media-scanner" - extract: true - - - name: Tidy media-scanner download - shell: bash - run: | - rm casparcg_server/media-scanner/*.zip - mv casparcg_server/media-scanner/* casparcg_server/ - rmdir casparcg_server/media-scanner - chmod +x casparcg_server/scanner - - - name: Rename build - id: "rename-build" - shell: bash - run: | - TARGET=casparcg-server-${{ github.sha }}-ubuntu22.zip - zip -r "$TARGET" casparcg_server/ - - echo "artifactname=$TARGET" >> $GITHUB_OUTPUT - - # 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 - - echo "uploadname=$TARGET" >> $GITHUB_OUTPUT - fi - fi - - - uses: actions/upload-artifact@v4 - with: - name: upload-artifact - path: ${{ steps.rename-build.outputs.artifactname }} - - - name: Copy single file to remote - if: ${{ steps.rename-build.outputs.uploadname }} - timeout-minutes: 5 - shell: bash - run: | - 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 }}"