Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Cesium
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bpresles
Cesium
Commits
7101ed14
Commit
7101ed14
authored
6 years ago
by
Benoit Lavenier
Browse files
Options
Downloads
Patches
Plain Diff
[enh] Release: add a check to make sure java is installed and is JRE 1.8
[fix] Restore build of windows assets
parent
43d5b181
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
release.sh
+24
-16
24 additions, 16 deletions
release.sh
with
24 additions
and
16 deletions
release.sh
+
24
−
16
View file @
7101ed14
...
...
@@ -53,15 +53,29 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then
esac
# Load env.sh if exists
if
[
-f
"
${
DIRNAME
}
/env.sh"
]
;
then
if
[
[
-f
"
${
DIRNAME
}
/env.sh"
]
]
;
then
source
${
DIRNAME
}
/env.sh
fi
# Check the Java version
JAVA_VERSION
=
`
java
-version
2>&1 |
grep
"java version"
|
awk
'{print $3}'
|
tr
-d
\"
`
if
[[
$?
-ne
0
]]
;
then
echo
"No Java JRE 1.8 found in machine. This is required for Android artifacts."
exit
-1
fi
JAVA_MINOR_VERSION
=
`
echo
${
JAVA_VERSION
}
|
awk
'{split($0, array, ".")} END{print array[2]}'
`
if
[[
${
JAVA_MINOR_VERSION
}
-ne
8
]]
;
then
echo
"Require a Java JRE in version 1.8, but found
${
JAVA_VERSION
}
. You can override your default JAVA_HOME in 'env.sh'."
exit
-1
fi
echo
"Java:
$JAVA_VERSION
"
# force nodejs version to 5
if
[
-d
"
$NVM_DIR
"
]
;
then
if
[
[
-d
"
$NVM_DIR
"
]
]
;
then
.
$NVM_DIR
/nvm.sh
nvm use 5
if
[
$?
-ne
0
]
;
then
if
[
[
$?
-ne
0
]
]
;
then
exit
-1
fi
else
...
...
@@ -81,7 +95,7 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then
echo
"- Building Android artifact..."
echo
"----------------------------------"
ionic build android
--release
if
[
$?
-ne
0
]
;
then
if
[
[
$?
-ne
0
]
]
;
then
exit
-1
fi
...
...
@@ -92,7 +106,7 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then
# Update config file
gulp config
--env
default
gulp build:web
--release
if
[
$?
-ne
0
]
;
then
if
[
[
$?
-ne
0
]
]
;
then
exit
-1
fi
...
...
@@ -107,7 +121,7 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then
git commit
-m
"v
$2
"
git tag
"v
$2
"
git push
if
[
$?
-ne
0
]
;
then
if
[
[
$?
-ne
0
]
]
;
then
exit
-1
fi
...
...
@@ -125,28 +139,22 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then
echo
"**********************************"
./github.sh
$1
''
"
$description
"
''
if
[
$?
-ne
0
]
;
then
if
[
[
$?
-ne
0
]
]
;
then
exit
-1
fi
echo
"----------------------------------"
echo
"- Building desktop
version
s..."
echo
"- Building desktop
artifact
s..."
echo
"----------------------------------"
# Remove old vagrant virtual machines
rm
-rf
~/.vagrant.d/
*
git submodule update
--init
git submodule
sync
cd
platforms/desktop
# Exclude Windows - TODO FIXME (not enough space in BL directories)
EXPECTED_ASSETS
=
"cesium-desktop-v
$2
-linux-x64.deb
cesium-desktop-v
$2
-linux-x64.tar.gz"
export
EXPECTED_ASSETS
# Build desktop assets
./release.sh
$2
if
[
$?
-ne
0
]
;
then
if
[
[
$?
-ne
0
]
]
;
then
exit
-1
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment