From 739d462c59a38390e3fccfd7fc5011de09233205 Mon Sep 17 00:00:00 2001
From: Giacomo Caironi <giacomo.caironi@skywarder.eu>
Date: Sun, 2 Jul 2023 16:56:12 +0000
Subject: [PATCH] Fix ci
---
.gitlab-ci.yml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59a6a090..d15014fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,7 @@
variables:
GIT_SUBMODULE_STRATEGY: recursive
+ QT_VERSION: 5.15.2
stages:
- lint
@@ -54,15 +55,16 @@ build_linux:
stage: build
script:
- ./sbs --clean
- - ./sbs
+ - Qt5_DIR=/opt/qt/$QT_VERSION/gcc_64/lib/cmake/Qt5/ ./sbs
- cd build
- - QMAKE=/opt/qt/5.15.2/gcc_64/bin/qmake linuxdeploy --plugin qt -e groundstation -d ../linuxdeploy/groundstation.desktop -i ../linuxdeploy/SkywardLogo.png --appdir AppDir
+ - QMAKE=/opt/qt/$QT_VERSION/gcc_64/bin/qmake linuxdeploy --plugin qt -e groundstation -d ../linuxdeploy/groundstation.desktop -i ../linuxdeploy/SkywardLogo.png --appdir AppDir
- appimagetool AppDir
- mv Ground_Station-x86_64.AppImage ../Ground_Station-$CI_COMMIT_SHORT_SHA-x86_64.AppImage
artifacts:
name: Linux AppImage
paths:
- Ground_Station-$CI_COMMIT_SHORT_SHA-x86_64.AppImage
+ expire_in: 7 days
build_windows:
stage: build
@@ -77,6 +79,7 @@ build_windows:
name: Windows executable
paths:
- Ground_Station-$CI_COMMIT_SHORT_SHA.exe
+ expire_in: 7 days
# release:
# tag_name: latest-$CI_COMMIT_SHORT_SHA
--
GitLab