From 7cf4bf966b13604820195f1a83860661faf68a31 Mon Sep 17 00:00:00 2001
From: Alexis Lopez Zubieta <contact@azubieta.net>
Date: Wed, 10 Feb 2021 18:06:56 -0600
Subject: [PATCH 1/4] fix ci
---
.gitlab-ci.yml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9992166..7bbe53e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,13 +51,15 @@ dekko:amd64:
paths:
- '*.AppImage'
expire_in: 1 week
- dependencies:
- - build
appimage:arm64:
<<: *arm64
extends: .appimage
+ dependencies:
+ - dekko:amd64
appimage:amd64:
<<: *amd64
- extends: .appimage
\ No newline at end of file
+ extends: .appimage
+ dependencies:
+ - dekko:amd64
\ No newline at end of file
--
GitLab
From 9f48f3302a4c3913e7e92751717da61312c0c8ea Mon Sep 17 00:00:00 2001
From: Alexis Lopez Zubieta <contact@azubieta.net>
Date: Wed, 10 Feb 2021 18:26:37 -0600
Subject: [PATCH 2/4] fix ci
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7bbe53e..8a2f5c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,7 +56,7 @@ appimage:arm64:
<<: *arm64
extends: .appimage
dependencies:
- - dekko:amd64
+ - dekko:arm64
appimage:amd64:
<<: *amd64
--
GitLab
From 32906621e84379f0bdcd38d4d7e617bc69c83dcf Mon Sep 17 00:00:00 2001
From: Alexis Lopez Zubieta <contact@azubieta.net>
Date: Thu, 11 Feb 2021 12:25:21 -0600
Subject: [PATCH 3/4] remove job tag
---
.gitlab-ci.yml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a2f5c7..6a9507e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,8 +20,6 @@ variables:
.dekko:
stage: build
image: clickable/ci-16.04-$ARCH:$CLICKABLE_VERSION
- tags:
- - docker
script:
- git clone https://gitlab.com/dekkan/dekko.git --recursive
- cd dekko
@@ -62,4 +60,4 @@ appimage:amd64:
<<: *amd64
extends: .appimage
dependencies:
- - dekko:amd64
\ No newline at end of file
+ - dekko:amd64
--
GitLab
From 9501b269364bda1c0886ec8d55a42152c614bdd0 Mon Sep 17 00:00:00 2001
From: Alexis Lopez Zubieta <contact@azubieta.net>
Date: Thu, 11 Feb 2021 13:12:20 -0600
Subject: [PATCH 4/4] Fix icon deployment
---
appimage-amd64.yml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/appimage-amd64.yml b/appimage-amd64.yml
index 2ec6b47..01d139b 100644
--- a/appimage-amd64.yml
+++ b/appimage-amd64.yml
@@ -2,14 +2,17 @@ version: 1
script:
- rm -rf AppDir || true
- - mkdir -p AppDir/usr/share/icons/hicolor/256x256/apps/
+ # copy click-app binaries
+ - mkdir -p AppDir/usr
- cp -r dekko/build/x86_64-linux-gnu/build/install-root/* AppDir/usr
+ # move qt5 parts to the right paths
- mkdir -p AppDir/usr/lib/x86_64-linux-gnu/qt5/qml/
- mv AppDir/usr/lib/x86_64-linux-gnu/{Dekko,QuickFlux,PlugMan,MazDB} AppDir/usr/lib/x86_64-linux-gnu/qt5/qml/
- mkdir -p AppDir/usr/share/qt5/translations/
- mv AppDir/usr/lib/x86_64-linux-gnu/*.qm AppDir/usr/share/qt5/translations/
-
- - cp click-app/dekko.png AppDir/usr/share/icons/hicolor/256x256/apps/
+ # move app icon to the right path
+ - mkdir -p AppDir/usr/share/icons/hicolor/256x256/apps/
+ - mv AppDir/usr/dekko.png AppDir/usr/share/icons/hicolor/256x256/apps/
# add fake upstart start
- mkdir -p AppDir/usr/bin
--
GitLab