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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
clients
Cesium-grp
Cesium
Commits
8c3f3194
Commit
8c3f3194
authored
3 years ago
by
Benoit Lavenier
Browse files
Options
Downloads
Patches
Plain Diff
[fix] FIx CI build
parent
fc2c9757
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#12938
failed
3 years ago
Stage: build
Stage: alt_build
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+31
-26
31 additions, 26 deletions
.gitlab-ci.yml
Dockerfile
+12
-10
12 additions, 10 deletions
Dockerfile
dist/desktop
+1
-1
1 addition, 1 deletion
dist/desktop
with
44 additions
and
37 deletions
.gitlab-ci.yml
+
31
−
26
View file @
8c3f3194
...
...
@@ -24,18 +24,9 @@ variables:
# Jobs templates
# ---------------------------------------------------------------
# ---------------------------------------------------------------
# Build jobs
# ---------------------------------------------------------------
fast-build
:
.build
:
stage
:
build
image
:
${CONTAINER_BUILD_IMAGE}
before_script
:
-
mv /customCache/node_modules ./
-
cp -rf /customCache/www ./
-
cp -rf /customCache/hooks ./
tags
:
[
redshift
]
script
:
-
yarn run build:web
after_script
:
...
...
@@ -46,32 +37,46 @@ fast-build:
paths
:
-
dist/web
expire_in
:
60 minutes
.docker
:
image
:
docker:latest
tags
:
[
redshift
]
services
:
-
docker:dind
before_script
:
-
docker login -u gitlab-ci-token -p ${CI_BUILD_TOKEN} ${CI_REGISTRY} ||
true
allow_failure
:
false
# ---------------------------------------------------------------
# Build jobs
# ---------------------------------------------------------------
fast-build
:
extends
:
.build
image
:
${CONTAINER_BUILD_IMAGE}
before_script
:
-
mv /customCache/node_modules ./
-
cp -rf /customCache/www ./
-
cp -rf /customCache/hooks ./
only
:
-
develop
failsafe-build
:
extends
:
.build
stage
:
alt_build
when
:
on_failure
script
:
before_
script
:
-
yarn
-
yarn run build:web
artifacts
:
untracked
:
true
paths
:
-
dist/web
expire_in
:
60 minutes
only
:
-
develop
docker-for-fast-build
:
extends
:
.docker
stage
:
alt_build
when
:
on_failure
allow_failure
:
true
tags
:
[
doppler-docker
]
image
:
docker:latest
services
:
-
docker:dind
script
:
before_script
:
-
echo 'FROM node:12' > Dockerfile
-
echo 'WORKDIR /customCache' >> Dockerfile
-
echo 'COPY ./ ./' >> Dockerfile
...
...
@@ -80,9 +85,9 @@ docker-for-fast-build:
-
echo 'RUN du -s `find . -maxdepth 1 | egrep -v "^\.$"`>/after.txt' >> Dockerfile
-
echo 'WORKDIR /build' >> Dockerfile
-
echo "RUN diff /before.txt /after.txt ||
true
" >> Dockerfile
-
docker login -u gitlab-ci-token -p "${CI_BUILD_TOKEN}" ${CI_REGISTRY}
-
docker build --pull -t
"
${CONTAINER_BUILD_IMAGE}
"
.
-
docker push
"
${CONTAINER_BUILD_IMAGE}
"
script
:
-
docker build --pull -t ${CONTAINER_BUILD_IMAGE} .
-
docker push ${CONTAINER_BUILD_IMAGE}
# ---------------------------------------------------------------
# Deploy jobs
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
12
−
10
View file @
8c3f3194
FROM
node:1
0-alpine
FROM
node:1
2
LABEL
maintainer="benoit [dot] lavenier [at] e-is [dot] pro"
LABEL
version="1.6.
3
"
LABEL
version="1.6.
12
"
LABEL
description="Cesium Wallet for Ğ1 libre currency"
ARG
CESIUM_VER="1.6.
3
"
ARG
CESIUM_VER="1.6.
12
"
ENV
DEBIAN_FRONTEND=noninteractive \
NODE_VERSION=1
0
.2
0
.0 \
NPM_VERSION=
6
.14.
4
\
YARN_VERSION=1.22.
4
\
IONIC_CLI_VERSION=6.6.
0
\
CORDOVA_VERSION=
8.1.2
\
GRADLE_VERSION=
4.10.3
\
GULP_VERSION=
3.9.1
NODE_VERSION=1
2
.2
1
.0 \
NPM_VERSION=
7
.14.
0
\
YARN_VERSION=1.22.
10
\
IONIC_CLI_VERSION=6.
1
6.
3
\
CORDOVA_VERSION=
10.0.0
\
GRADLE_VERSION=
6.5.1
\
GULP_VERSION=
4.0.2
# Install basics
RUN
apk update
&&
\
...
...
@@ -31,6 +31,8 @@ RUN yarn global add gulp@"$GULP_VERSION" @ionic/cli@"$IONIC_CLI_VERSION"
# copy source tree
COPY
./ ./
RUN
test
-f
package.json
||
git clone https://github.com/duniter/cesium.git
&&
cd
cesium
# Install project dependencies
# Workaround need for node-sass (- )see https://github.com/yarnpkg/yarn/issues/4867)
RUN
yarn
install
--ignore-engines
&&
\
...
...
This diff is collapsed.
Click to expand it.
desktop
@
6893ddeb
Compare
62c8e26d
...
6893ddeb
Subproject commit 6
2c8e26d1492b863d10b402669bf105a29353818
Subproject commit 6
893ddeb3aac99329524151029f44e4cf821502f
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