From 7472dcdbb87f2ad1f85f08521981e648ef86d0c8 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Mon, 11 Jul 2022 01:02:06 +0100 Subject: [PATCH] Fix Xbox One/Series CI build `upload-artifact` preserves the least common ancestor of the directory tree but we actually want the zip file to be flat. --- .github/workflows/xbox_one.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/xbox_one.yml b/.github/workflows/xbox_one.yml index 9713951d4..71c0fe063 100644 --- a/.github/workflows/xbox_one.yml +++ b/.github/workflows/xbox_one.yml @@ -30,6 +30,14 @@ jobs: cd ${{ github.workspace }}\Packaging\xbox-one build.bat + - name: Copy artifacts to package directory + run: > + New-Item -Path build\uwp-project -Name pkg -ItemType Directory -Force && + Copy-Item -Recurse -Container:$false -Path build\uwp-project\AppxPackages + -Filter Microsoft.VCLibs.x64.*.appx -Destination build\uwp-project\pkg\ && + Copy-Item -Recurse -Container:$false -Path build\uwp-project\Release + -Filter devilutionX_*_x64.appx -Destination build\uwp-project\pkg\ + - name: Upload-Package if: ${{ !env.ACT }} uses: actions/upload-artifact@v3 @@ -37,5 +45,4 @@ jobs: name: devilutionx-xbox-one.zip if-no-files-found: error path: | - build/uwp-project/AppxPackages/**/Microsoft.VCLibs.x64.*.appx - build/uwp-project/Release/**/devilutionX_*_x64.appx + build/uwp-project/pkg/