Merge pull request #202 from koplo199/bottlesdevs-pr

Attempt to fix the CI
bottlesdevs · Dec 16, 2022 · 582a067 · 582a067
2 parents 6137eaf + 2f5c6e2
commit 582a067
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git 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
 
@@ -166,7 +168,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

diff --git 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