diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b453b6b8728b50633d05e40ca3a7e9aa0f5ac509..35c196bd1a65e7548cc3a69e1c9dab146a01df7f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,7 +63,7 @@ build_linux: - cmake -Bbuild -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=RelWithDebInfo . - cmake --build build -j 16 - cd build - - linuxdeploy --plugin qt -e groundstation -d ../linuxdeploy/groundstation.desktop -i ../linuxdeploy/SkywardLogo.png --appdir AppDir + - linuxdeploy --plugin qt -e groundstation -d ../deployment/linuxdeploy/groundstation.desktop -i ../deployment/linuxdeploy/SkywardLogo.png --appdir AppDir - appimagetool AppDir - mv Ground_Station-x86_64.AppImage ../Ground_Station-$CI_COMMIT_SHORT_SHA-x86_64.AppImage artifacts: diff --git a/linuxdeploy/SkywardLogo.png b/deployment/linuxdeploy/SkywardLogo.png similarity index 100% rename from linuxdeploy/SkywardLogo.png rename to deployment/linuxdeploy/SkywardLogo.png diff --git a/linuxdeploy/groundstation.desktop b/deployment/linuxdeploy/groundstation.desktop similarity index 100% rename from linuxdeploy/groundstation.desktop rename to deployment/linuxdeploy/groundstation.desktop diff --git a/macdeploy.sh b/deployment/macdeploy.sh similarity index 100% rename from macdeploy.sh rename to deployment/macdeploy.sh diff --git a/windeploy.bat b/deployment/windeploy.bat similarity index 73% rename from windeploy.bat rename to deployment/windeploy.bat index dc498ec4b36fa554242dafc4d3c3a8f5e80d1c41..42949508e927ebec3fef5f6c61b297e509477f3a 100644 --- a/windeploy.bat +++ b/deployment/windeploy.bat @@ -1,2 +1,2 @@ windeployqt --dir Deploy\SkywardHub ..\build-SkywardHub-Desktop_Qt_5_15_2_MinGW_32_bit-Release\Release\SkywardHub.exe -xcopy ..\build-SkywardHub-Desktop_Qt_5_15_2_MinGW_32_bit-Release\release\SkywardHub.exe Deploy\SkywardHub\SkywardHub.exe /f /y \ No newline at end of file +xcopy ..\build-SkywardHub-Desktop_Qt_5_15_2_MinGW_32_bit-Release\release\SkywardHub.exe Deploy\SkywardHub\SkywardHub.exe /f /y