Skip to content

Commit

Permalink
Switch to using scp-action instead of rsync
Browse files Browse the repository at this point in the history
The burnett01/rsync-deployments action doesn't create parent
directories, which adds the requirement for an additional step to create
the target directory, which I find messy.

Switch to using appleboy/scp-action instead, which does create the
parent directories as expected.
  • Loading branch information
joshuaboniface committed Mar 9, 2024
1 parent b97b94c commit f9589ee
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/_meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,14 @@ jobs:
./artifact/**/*.deb
- name: Upload release archive to repo.jellyfin.org
uses: burnett01/rsync-deployments@45d84ad5f6c174f3e0ffc50e9060a9666d09c16e # 6.0.0
uses: appleboy/scp-action@917f8b81dfc1ccd331fef9e2d61bdc6c8be94634 # v0.1.7
with:
switches: -vrptz
path: ./artifact/*
remote_path: /srv/incoming/ffmpeg/${{ steps.set_version.outputs.no-v }}/${{ inputs.distro }}/${{ matrix.arch }}/
remote_host: ${{ secrets.REPO_HOST }}
remote_user: ${{ secrets.REPO_USER }}
remote_key: ${{ secrets.REPO_KEY }}
host: ${{ secrets.REPO_HOST }}
username: ${{ secrets.REPO_USER }}
key: ${{ secrets.REPO_KEY }}
source: artifact/*
strip_components: 1
target: /srv/incoming/ffmpeg/${{ steps.set_version.outputs.no-v }}/${{ inputs.distro }}/${{ matrix.arch }}/

- name: Move incoming release into repository
uses: appleboy/ssh-action@8f949198563a347a01c65ffc60399aef2b59d4ab # v1.0.1
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/_meta_mac_portable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ jobs:
./artifact/**/*.tar.xz
- name: Upload release archive to repo.jellyfin.org
uses: burnett01/rsync-deployments@45d84ad5f6c174f3e0ffc50e9060a9666d09c16e # 6.0.0
uses: appleboy/scp-action@917f8b81dfc1ccd331fef9e2d61bdc6c8be94634 # v0.1.7
with:
switches: -vrptz
path: ./artifact/*
remote_path: /srv/incoming/ffmpeg/${{ steps.set_version.outputs.no-v }}/macos/${{ matrix.arch }}/
remote_host: ${{ secrets.REPO_HOST }}
remote_user: ${{ secrets.REPO_USER }}
remote_key: ${{ secrets.REPO_KEY }}
host: ${{ secrets.REPO_HOST }}
username: ${{ secrets.REPO_USER }}
key: ${{ secrets.REPO_KEY }}
source: artifact/*
strip_components: 1
target: /srv/incoming/ffmpeg/${{ steps.set_version.outputs.no-v }}/macos/${{ matrix.arch }}/

- name: Move incoming release into repository
uses: appleboy/ssh-action@8f949198563a347a01c65ffc60399aef2b59d4ab # v1.0.1
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/_meta_portable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@ jobs:
./artifact/**/*.tar.xz
- name: Upload release archive to repo.jellyfin.org
uses: burnett01/rsync-deployments@45d84ad5f6c174f3e0ffc50e9060a9666d09c16e # 6.0.0
uses: appleboy/scp-action@917f8b81dfc1ccd331fef9e2d61bdc6c8be94634 # v0.1.7
with:
switches: -vrptz
path: ./artifact/*
remote_path: /srv/incoming/ffmpeg/${{ steps.set_version.outputs.no-v }}/${{ inputs.os }}/${{ matrix.arch }}/
remote_host: ${{ secrets.REPO_HOST }}
remote_user: ${{ secrets.REPO_USER }}
remote_key: ${{ secrets.REPO_KEY }}
host: ${{ secrets.REPO_HOST }}
username: ${{ secrets.REPO_USER }}
key: ${{ secrets.REPO_KEY }}
source: artifact/*
strip_components: 1
target: /srv/incoming/ffmpeg/${{ steps.set_version.outputs.no-v }}/${{ inputs.os }}/${{ matrix.arch }}/

- name: Move incoming release into repository
uses: appleboy/ssh-action@8f949198563a347a01c65ffc60399aef2b59d4ab # v1.0.1
Expand Down

0 comments on commit f9589ee

Please sign in to comment.