Skip to content

Fix #2382 #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 19, 2022
Merged

Fix #2382 #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ff2bc4
Merge pull request #60 from bottlesdevs/main
koplo199 Dec 17, 2022
0df9ede
Remove broken dxvk experimental build
koplo199 Dec 18, 2022
40c6c7b
Fix folder structure for dxvk-nvapi + all experimental builds
koplo199 Dec 18, 2022
8097863
Remove soon to be broken dxvk-nvapi
koplo199 Dec 18, 2022
5d2bbfe
Handle empty file case correctly
koplo199 Dec 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/pull-components.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,12 @@ jobs:
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
elif [[ $release_archive_name == "dxvk-nvapi"* ]]; then
curl -fsSLO "$release_archive_url"
mkdir "${{ env.NAME }}"
tar -xvf $release_archive_name --directory "${{ env.NAME }}"
tar -zcvf "${{ env.NAME }}.tar.gz" "${{ env.NAME }}"
echo "UPLOAD_FILE=$(pwd)/${{ env.NAME }}.tar.gz" >> $GITHUB_ENV
fi

- name: Check for new artifact
Expand Down Expand Up @@ -168,7 +174,9 @@ jobs:
if [[ "${{ env.NAMEPREFIX }}" == "dxvk"* ]]; then
rm -rf "$folder/usr"
fi
tar -C "$folder" -zcvf "${{ env.NAME }}.tar.gz" .
mkdir "${{ env.NAME }}"
mv "$folder"/* "${{ env.NAME }}"
tar -zcvf "${{ env.NAME }}.tar.gz" "${{ env.NAME }}"
echo "UPLOAD_FILE=$(pwd)/${{ env.NAME }}.tar.gz" >> $GITHUB_ENV

- name: Upload component archive
Expand Down
4 changes: 0 additions & 4 deletions input_files/14-dxvk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
dxvk-2.0-1-18b0ef6:
Category: dxvk
Channel: unstable
Date: '1671209496'
dxvk-2.0:
Category: dxvk
Channel: stable
Expand Down
20 changes: 0 additions & 20 deletions input_files/16-dxvk-nvapi.yml
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion input_files/update_yml_entries.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ GITHUB_ENV=${GITHUB_ENV-/dev/null}
command_wo_sub="{\"$component_name\": {\"Category\":\"$category\", \"Channel\": \"$channel\", \"Date\": \"$created_at\"}}"
command_w_sub="{\"$component_name\": {\"Category\":\"$category\", \"Sub-category\":\"$subcategory\", \"Channel\": \"$channel\", \"Date\": \"$created_at\"}}"

if ! [ -f "$filename" ]; then
empty_file=$(yq "." $filename)
if ! [ -f "$filename" ] || [ -z "$empty_file" ]; then
touch $filename
if [ -z "$subcategory" ]; then
yq -n -i -y "$command_wo_sub" $filename
Expand Down