Skip to content
Snippets Groups Projects
Commit cddf0375 authored by Giacomo Caironi's avatar Giacomo Caironi
Browse files

Merge branch 'fix_ci' into 'main'

Fix ci

See merge request !5
parents 1a8f0e9b 739d462c
No related branches found
No related tags found
1 merge request!5Fix ci
Pipeline #5821 passed
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
QT_VERSION: 5.15.2
stages: stages:
- lint - lint
...@@ -54,15 +55,16 @@ build_linux: ...@@ -54,15 +55,16 @@ build_linux:
stage: build stage: build
script: script:
- ./sbs --clean - ./sbs --clean
- ./sbs - Qt5_DIR=/opt/qt/$QT_VERSION/gcc_64/lib/cmake/Qt5/ ./sbs
- cd build - 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 - appimagetool AppDir
- mv Ground_Station-x86_64.AppImage ../Ground_Station-$CI_COMMIT_SHORT_SHA-x86_64.AppImage - mv Ground_Station-x86_64.AppImage ../Ground_Station-$CI_COMMIT_SHORT_SHA-x86_64.AppImage
artifacts: artifacts:
name: Linux AppImage name: Linux AppImage
paths: paths:
- Ground_Station-$CI_COMMIT_SHORT_SHA-x86_64.AppImage - Ground_Station-$CI_COMMIT_SHORT_SHA-x86_64.AppImage
expire_in: 7 days
build_windows: build_windows:
stage: build stage: build
...@@ -77,6 +79,7 @@ build_windows: ...@@ -77,6 +79,7 @@ build_windows:
name: Windows executable name: Windows executable
paths: paths:
- Ground_Station-$CI_COMMIT_SHORT_SHA.exe - Ground_Station-$CI_COMMIT_SHORT_SHA.exe
expire_in: 7 days
# release: # release:
# tag_name: latest-$CI_COMMIT_SHORT_SHA # tag_name: latest-$CI_COMMIT_SHORT_SHA
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment