Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Cesium
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
clients
Cesium-grp
Cesium
Commits
ed927a5e
Commit
ed927a5e
authored
4 years ago
by
Benoit Lavenier
Browse files
Options
Downloads
Patches
Plain Diff
[fix] Retry to build using CI
parent
0660404d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#12934
failed
4 years ago
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+11
-12
11 additions, 12 deletions
.gitlab-ci.yml
dist/desktop
+1
-1
1 addition, 1 deletion
dist/desktop
package.json
+2
-2
2 additions, 2 deletions
package.json
www/js/config.js
+1
-13
1 addition, 13 deletions
www/js/config.js
with
15 additions
and
28 deletions
.gitlab-ci.yml
+
11
−
12
View file @
ed927a5e
stages
:
#
- build
#
- alt_build
-
build
-
alt_build
#- publish
fast-build
:
...
...
@@ -11,7 +11,7 @@ fast-build:
-
cp -rf /customCache/www ./
-
cp -rf /customCache/hooks ./
script
:
-
node ./node_modules/gulp/bin/gulp webBuild
-
yarn run build:web
after_script
:
-
ls -la dist/web/
-
du -csh dist/web/
...
...
@@ -23,14 +23,14 @@ fast-build:
only
:
-
master
-
tags
failsafe-build
:
stage
:
alt_build
when
:
on_failure
image
:
node:1
0
image
:
node:1
2
script
:
-
yarn
-
node ./node_modules/gulp/bin/gulp config --env default
-
node ./node_modules/gulp/bin/gulp webBuild
-
yarn run build:web
artifacts
:
untracked
:
true
paths
:
...
...
@@ -39,17 +39,17 @@ failsafe-build:
only
:
-
master
-
tags
docker-for-fast-build
:
stage
:
alt_build
when
:
on_failure
allow_failure
:
true
tags
:
-
doppler-docker
tags
:
[
doppler-docker
]
image
:
docker:latest
services
:
-
docker:dind
script
:
-
echo 'FROM node:1
0
' > Dockerfile
-
echo 'FROM node:1
2
' > Dockerfile
-
echo 'WORKDIR /customCache' >> Dockerfile
-
echo 'COPY ./ ./' >> Dockerfile
-
echo 'RUN du -s `find . -maxdepth 1 | egrep -v "^\.$"`>/before.txt' >> Dockerfile
...
...
@@ -61,10 +61,9 @@ docker-for-fast-build:
-
docker build --pull -t "$CI_REGISTRY_IMAGE" .
-
docker push "$CI_REGISTRY_IMAGE"
pages
:
stage
:
publish
image
:
node:1
0
image
:
node:1
2
variables
:
GIT_STRATEGY
:
none
script
:
...
...
@@ -97,7 +96,7 @@ mirror:
release-web
:
stage
:
publish
image
:
node:1
0
image
:
node:1
2
variables
:
GIT_STRATEGY
:
none
script
:
...
...
This diff is collapsed.
Click to expand it.
desktop
@
05c905f9
Compare
366b85e1
...
05c905f9
Subproject commit
366b85e16a589746f53ad260a02abdaa346a1212
Subproject commit
05c905f9f5cc2cc8698a995e87797991e87e9a26
This diff is collapsed.
Click to expand it.
package.json
+
2
−
2
View file @
ed927a5e
...
...
@@ -10,7 +10,7 @@
"url"
:
"git@git.duniter.org:clients/cesium/cesium.git"
},
"scripts"
:
{
"clean"
:
"clean webClean webExtClean &&
trash dist/desktop/**/*.deb
platforms/android/**/*.apk"
,
"clean"
:
"
gulp
clean webClean webExtClean &&
rm -rf dist/web dist/android && rm -f desktop/**/cesium-*.deb desktop/**/cesium-*.exe
platforms/android/**/*.apk"
,
"postinstall"
:
"node scripts/node/postinstall.js"
,
"lint"
:
"gulp lint"
,
"install-platforms"
:
"ionic cordova prepare"
,
...
...
This diff is collapsed.
Click to expand it.
www/js/config.js
+
1
−
13
View file @
ed927a5e
...
...
@@ -70,14 +70,6 @@ angular.module("cesium.config", [])
"
host
"
:
"
g1.presles.fr
"
,
"
port
"
:
443
},
{
"
host
"
:
"
g1.le-sou.org
"
,
"
port
"
:
443
},
{
"
host
"
:
"
duniter.normandie-libre.fr
"
,
"
port
"
:
443
},
{
"
host
"
:
"
g1.duniter.org
"
,
"
port
"
:
443
...
...
@@ -101,10 +93,6 @@ angular.module("cesium.config", [])
"
host
"
:
"
g1.data.presles.fr
"
,
"
port
"
:
443
},
{
"
host
"
:
"
g1.data.le-sou.org
"
,
"
port
"
:
443
},
{
"
host
"
:
"
g1.data.mithril.re
"
,
"
port
"
:
443
...
...
@@ -120,7 +108,7 @@ angular.module("cesium.config", [])
}
},
"
version
"
:
"
1.6.12
"
,
"
build
"
:
"
2021-0
3-03T20:44:36.248
Z
"
,
"
build
"
:
"
2021-0
6-22T13:41:45.032
Z
"
,
"
newIssueUrl
"
:
"
https://git.duniter.org/clients/cesium-grp/cesium/issues/new
"
})
...
...
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