Skip to content

Commit 582a067

Browse files
author
Mirko Brombin
authored
Merge pull request #202 from koplo199/bottlesdevs-pr
Attempt to fix the CI
2 parents 6137eaf + 2f5c6e2 commit 582a067

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

.github/workflows/pull-components.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,12 @@ jobs:
121121
if: env.UPDATED == 'true'
122122
working-directory: "bottle-components-repository"
123123
run: |
124-
release_archive=${{ fromJSON(steps.check-release.outputs.asset).url }}
125-
if [[ $release_archive == *".tar.zst" ]]; then
126-
tar --use-compress-program=unzstd -xvf $release_archive
127-
tar -C "${{ env.NAME }}" -zcvf "${{ env.NAME }}.tar.gz" $(ls ${{ env.NAME }})
124+
release_archive_url=${{ fromJSON(steps.check-release.outputs.asset).url }}
125+
release_archive_name=${{ fromJSON(steps.check-release.outputs.asset).name }}
126+
if [[ $release_archive_name == *".tar.zst" ]]; then
127+
curl -fsSLO "$release_archive_url"
128+
tar --use-compress-program=unzstd -xvf $release_archive_name
129+
tar -zcvf "${{ env.NAME }}.tar.gz" "${{ env.NAME }}"
128130
echo "UPLOAD_FILE=$(pwd)/${{ env.NAME }}.tar.gz" >> $GITHUB_ENV
129131
fi
130132
@@ -166,7 +168,7 @@ jobs:
166168
if [[ "${{ env.NAMEPREFIX }}" == "dxvk"* ]]; then
167169
rm -rf "$folder/usr"
168170
fi
169-
tar -C "$folder" -zcvf "${{ env.NAME }}.tar.gz" $(ls "$folder")
171+
tar -C "$folder" -zcvf "${{ env.NAME }}.tar.gz" .
170172
echo "UPLOAD_FILE=$(pwd)/${{ env.NAME }}.tar.gz" >> $GITHUB_ENV
171173
172174
- name: Upload component archive

input_files/14-dxvk.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
dxvk-2.0-1-c55c093:
2-
Category: dxvk
3-
Channel: unstable
4-
Date: '1670785732'
51
dxvk-2.0:
62
Category: dxvk
73
Channel: stable

0 commit comments

Comments
 (0)