Commit 106aa7da authored by Benoit Lavenier's avatar Benoit Lavenier

[fix] Build desktop release: make sure to checkout last updates

parent 6bfcadcd
Pipeline #7140 passed with stages
in 7 minutes and 5 seconds
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
"name": "cesium", "name": "cesium",
"version": "1.4.12", "version": "1.4.12",
"description": "Cesium Wallet for G1 libre currency", "description": "Cesium Wallet for G1 libre currency",
"author": "Benoit Lavenier <benoit.lavenier@e-is.pro>",
"license": "AGPL-3.0",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git@git.duniter.org:clients/cesium/cesium.git" "url": "git@git.duniter.org:clients/cesium/cesium.git"
...@@ -22,8 +24,6 @@ ...@@ -22,8 +24,6 @@
"cordova", "cordova",
"crypto-currency" "crypto-currency"
], ],
"author": "Benoit Lavenier <benoit.lavenier@e-is.pro>",
"license": "AGPL-3.0",
"readmeFilename": "README.md", "readmeFilename": "README.md",
"bugs": { "bugs": {
"url": "https://git.duniter.org/clients/cesium-grp/cesium/issues", "url": "https://git.duniter.org/clients/cesium-grp/cesium/issues",
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
{ {
"platform": "ios", "platform": "ios",
"version": "5.1.0", "version": "5.1.0",
"locator": "https://github.com/E-IS/cordova-ios.git#5.1.0" "locator": "https://github.com/bpresles/cordova-ios.git#5.1.0"
}, },
{ {
"platform": "android", "platform": "android",
...@@ -169,4 +169,4 @@ ...@@ -169,4 +169,4 @@
"osx" "osx"
] ]
} }
} }
\ No newline at end of file
...@@ -161,12 +161,17 @@ echo "----------------------------------" ...@@ -161,12 +161,17 @@ echo "----------------------------------"
echo "- Building desktop artifacts..." echo "- Building desktop artifacts..."
echo "----------------------------------" echo "----------------------------------"
git submodule init git submodule init && git submodule sync && git submodule update --remote --merge
git submodule sync if [[ $? -ne 0 ]]; then
git submodule update --remote --merge echo "Unable to sync git submodule. Could not build desktop version"
exit 1
fi
if [[ -d "${DIRNAME}/platforms/desktop" ]]; then if [[ -d "${DIRNAME}/platforms/desktop" ]]; then
cd ${DIRNAME}/platforms/desktop cd "${DIRNAME}/platforms/desktop"
# Fetch last updates
git fetch origin && git merge origin/master || exit 1
# Build desktop assets # Build desktop assets
./release.sh $2 ./release.sh $2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment