From 8b04424380b4f09bb4bef8e0f2126deadf8246bf Mon Sep 17 00:00:00 2001 From: koplo199 <85577251+koplo199@users.noreply.github.com> Date: Thu, 15 Dec 2022 21:56:14 +0100 Subject: [PATCH 1/3] Adapt new folder structure --- .github/workflows/pull-components.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-components.yml b/.github/workflows/pull-components.yml index e183daab..de7105ec 100644 --- a/.github/workflows/pull-components.yml +++ b/.github/workflows/pull-components.yml @@ -166,7 +166,7 @@ jobs: if [[ "${{ env.NAMEPREFIX }}" == "dxvk"* ]]; then rm -rf "$folder/usr" fi - tar -C "$folder" -zcvf "${{ env.NAME }}.tar.gz" $(ls "$folder") + tar -C "$folder" -zcvf "${{ env.NAME }}.tar.gz" . echo "UPLOAD_FILE=$(pwd)/${{ env.NAME }}.tar.gz" >> $GITHUB_ENV - name: Upload component archive From cef53be095f12f78d71497defc06b35559b51b0f Mon Sep 17 00:00:00 2001 From: koplo199 <85577251+koplo199@users.noreply.github.com> Date: Thu, 15 Dec 2022 22:23:53 +0100 Subject: [PATCH 2/3] Fix vkd3d-proton release archive handling --- .github/workflows/pull-components.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull-components.yml b/.github/workflows/pull-components.yml index de7105ec..9a147285 100644 --- a/.github/workflows/pull-components.yml +++ b/.github/workflows/pull-components.yml @@ -121,10 +121,12 @@ jobs: if: env.UPDATED == 'true' working-directory: "bottle-components-repository" run: | - release_archive=${{ fromJSON(steps.check-release.outputs.asset).url }} - if [[ $release_archive == *".tar.zst" ]]; then - tar --use-compress-program=unzstd -xvf $release_archive - tar -C "${{ env.NAME }}" -zcvf "${{ env.NAME }}.tar.gz" $(ls ${{ env.NAME }}) + release_archive_url=${{ fromJSON(steps.check-release.outputs.asset).url }} + release_archive_name=${{ fromJSON(steps.check-release.outputs.asset).name }} + if [[ $release_archive_name == *".tar.zst" ]]; then + curl -fsSLO "$release_archive_url" + tar --use-compress-program=unzstd -xvf $release_archive_name + tar -zcvf "${{ env.NAME }}.tar.gz" "${{ env.NAME }}" echo "UPLOAD_FILE=$(pwd)/${{ env.NAME }}.tar.gz" >> $GITHUB_ENV fi From 2f5c6e29d1a0278699d76ffc2d4abbfbaed7c1b8 Mon Sep 17 00:00:00 2001 From: koplo199 <85577251+koplo199@users.noreply.github.com> Date: Fri, 16 Dec 2022 02:26:36 +0100 Subject: [PATCH 3/3] Remove broken dxvk experimental build --- input_files/14-dxvk.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/input_files/14-dxvk.yml b/input_files/14-dxvk.yml index 20108cf1..36851a23 100644 --- a/input_files/14-dxvk.yml +++ b/input_files/14-dxvk.yml @@ -1,7 +1,3 @@ -dxvk-2.0-1-c55c093: - Category: dxvk - Channel: unstable - Date: '1670785732' dxvk-2.0: Category: dxvk Channel: stable