From cf4a64ed76ea7decadabafe01f099a05eb18703e Mon Sep 17 00:00:00 2001
From: Alberto Nidasio <nidasioalberto@gmail.com>
Date: Fri, 2 Aug 2024 22:21:30 +0200
Subject: [PATCH] [CI] Moved deployment scripts into a new folder
---
.gitlab-ci.yml | 2 +-
.../linuxdeploy}/SkywardLogo.png | Bin
.../linuxdeploy}/groundstation.desktop | 0
macdeploy.sh => deployment/macdeploy.sh | 0
windeploy.bat => deployment/windeploy.bat | 2 +-
5 files changed, 2 insertions(+), 2 deletions(-)
rename {linuxdeploy => deployment/linuxdeploy}/SkywardLogo.png (100%)
rename {linuxdeploy => deployment/linuxdeploy}/groundstation.desktop (100%)
rename macdeploy.sh => deployment/macdeploy.sh (100%)
rename windeploy.bat => deployment/windeploy.bat (73%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c5d6515..be80eb13 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 dc498ec4..42949508 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
--
GitLab