From 2ccb17f6820a9d4cfe0c88bd0047db011d62be54 Mon Sep 17 00:00:00 2001 From: blavenie <benoit.lavenier@e-is.pro> Date: Wed, 2 Jan 2019 13:14:19 +0100 Subject: [PATCH] [fix] Build desktop using the cesium-desktop master/origin --- platforms/desktop | 2 +- release.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platforms/desktop b/platforms/desktop index b95f5859..63c7db21 160000 --- a/platforms/desktop +++ b/platforms/desktop @@ -1 +1 @@ -Subproject commit b95f58597b7d438a11f5431bede84d30d2fd1456 +Subproject commit 63c7db21fc39fcd874cbce5b57d3a969a33587ea diff --git a/release.sh b/release.sh index 0b078143..2f36f7db 100755 --- a/release.sh +++ b/release.sh @@ -148,7 +148,8 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then echo "----------------------------------" - git submodule update --init + #FIXME: ceci empêche d'etre sur le master/origin de cesium-desktop + #git submodule update --init git submodule sync cd platforms/desktop -- GitLab