From dc34cb33e31d37f3e9dde3f838e9f7b1050438a6 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 22 Oct 2021 15:36:53 +0200 Subject: [PATCH] Prospective fix for windows artifact directory structure GH action's upload-artifact strips the provided path --- .github/workflows/sixtyfps_viewer_binary.yaml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/sixtyfps_viewer_binary.yaml b/.github/workflows/sixtyfps_viewer_binary.yaml index 6e793e6c9..dcfb1747c 100644 --- a/.github/workflows/sixtyfps_viewer_binary.yaml +++ b/.github/workflows/sixtyfps_viewer_binary.yaml @@ -38,26 +38,29 @@ jobs: args: --verbose --no-default-features --features sixtyfps-backend-qt --release -p sixtyfps-viewer - name: Create artifact directory run: | + mkdir pkg + cd pkg mkdir sixtyfps-viewer cd sixtyfps-viewer mkdir bin - cp ..\target/release/sixtyfps-viewer.exe bin/ - cp ..\..\Qt\5.15.2\msvc2019_64\bin/Qt5Core.dll bin/ - cp ..\..\Qt\5.15.2\msvc2019_64\bin/Qt5Gui.dll bin/ - cp ..\..\Qt\5.15.2\msvc2019_64\bin/Qt5Widgets.dll bin/ + cp ..\..\target/release/sixtyfps-viewer.exe bin/ + cp ..\..\..\Qt\5.15.2\msvc2019_64\bin/Qt5Core.dll bin/ + cp ..\..\..\Qt\5.15.2\msvc2019_64\bin/Qt5Gui.dll bin/ + cp ..\..\..\Qt\5.15.2\msvc2019_64\bin/Qt5Widgets.dll bin/ mkdir bin\plugins\platforms - cp ..\..\Qt\5.15.2\msvc2019_64\plugins\platforms\qwindows.dll bin/plugins/platforms + cp ..\..\..\Qt\5.15.2\msvc2019_64\plugins\platforms\qwindows.dll bin/plugins/platforms mkdir bin\plugins\styles - cp ..\..\Qt\5.15.2\msvc2019_64\plugins\styles\qwindowsvistastyle.dll bin/plugins/styles + cp ..\..\..\Qt\5.15.2\msvc2019_64\plugins\styles\qwindowsvistastyle.dll bin/plugins/styles cd .. - ./scripts/prepare_binary_package.sh sixtyfps-viewer ..\Qt 5.15.2 + cd .. + ./scripts/prepare_binary_package.sh pkg\sixtyfps-viewer ..\Qt 5.15.2 - name: Upload artifact uses: actions/upload-artifact@v2 with: name: sixtyfps-viewer-windows path: | - sixtyfps-viewer + pkg build_linux: runs-on: ubuntu-20.04