From 19cccf3dad46f98fbc97d66a3daec6d914025ecf Mon Sep 17 00:00:00 2001 From: Shadowghost Date: Mon, 7 Mar 2022 08:19:38 +0100 Subject: [PATCH 1/2] fix(ci): fix glob and variable interpolation --- .github/workflows/_meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/_meta.yaml b/.github/workflows/_meta.yaml index 96beddcccf8..c3953b045f9 100644 --- a/.github/workflows/_meta.yaml +++ b/.github/workflows/_meta.yaml @@ -102,9 +102,9 @@ jobs: with: upload_url: ${{ github.event.release.upload_url }} asset_path: | - ./artifact/*.zip' - ./artifact/*.deb' - ./artifact/*.sha256sum' + ./artifact/**/*.zip + ./artifact/**/*.deb + ./artifact/**/*.sha256sum - name: Make Sure Release Directory Exists uses: appleboy/ssh-action@v0.1.4 @@ -113,14 +113,14 @@ jobs: username: ${{ secrets.deploy-user }} key: ${{ secrets.deploy-key }} script_stop: true - script: mkdir -p /srv/repository/releases/server/${inputs.distro}/versions/jellyfin-ffmpeg/${steps.set_version.outputs.no-v}/ + script: mkdir -p /srv/repository/releases/server/${{ inputs.distro }}/versions/jellyfin-ffmpeg/${{ steps.set_version.outputs.no-v }}/ - name: Upload Release Assets uses: burnett01/rsync-deployments@5.2 with: switches: -vrptz path: ./artifact/* - remote_path: /srv/repository/releases/server/${inputs.distro}/versions/jellyfin-ffmpeg/${steps.set_version.outputs.no-v}/ + remote_path: /srv/repository/releases/server/${{ inputs.distro }}/versions/jellyfin-ffmpeg/${{ steps.set_version.outputs.no-v }}/ remote_host: ${{ secrets.deploy-host }} remote_user: ${{ secrets.deploy-user }} remote_key: ${{ secrets.deploy-key }} From 656769ac124caa46efab664261c6ce56cc83d975 Mon Sep 17 00:00:00 2001 From: Shadowghost Date: Mon, 7 Mar 2022 09:50:54 +0100 Subject: [PATCH 2/2] chore(ci): bump GitHub Action versions --- .github/workflows/_meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_meta.yaml b/.github/workflows/_meta.yaml index c3953b045f9..1a17fffff6f 100644 --- a/.github/workflows/_meta.yaml +++ b/.github/workflows/_meta.yaml @@ -52,7 +52,7 @@ jobs: run: ./build-win64 dist - name: Upload Artifacts - uses: actions/upload-artifact@v2.3.1 + uses: actions/upload-artifact@v3.0.0 with: name: ${{ inputs.distro }}-${{ matrix.release }}-${{ matrix.arch }} path: dist @@ -84,7 +84,7 @@ jobs: core.setOutput('no-dash', no_dash) - name: Download Artifacts - uses: actions/download-artifact@v2.1.0 + uses: actions/download-artifact@v3.0.0 with: name: ${{ inputs.distro }}-${{ matrix.release }}-${{ matrix.arch }} path: artifact