diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index facf101c0fc8b3eaad26a124503e4bbd3185f8ca..503e3d2129adb2b753daa69f0abb6e81e4bf4c17 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ 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:10 + image: node:12 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:10' > Dockerfile + - echo 'FROM node:12' > 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:10 + image: node:12 variables: GIT_STRATEGY: none script: @@ -97,7 +96,7 @@ mirror: release-web: stage: publish - image: node:10 + image: node:12 variables: GIT_STRATEGY: none script: diff --git a/dist/desktop b/dist/desktop index 366b85e16a589746f53ad260a02abdaa346a1212..05c905f9f5cc2cc8698a995e87797991e87e9a26 160000 --- a/dist/desktop +++ b/dist/desktop @@ -1 +1 @@ -Subproject commit 366b85e16a589746f53ad260a02abdaa346a1212 +Subproject commit 05c905f9f5cc2cc8698a995e87797991e87e9a26 diff --git a/package.json b/package.json index 7cb527ff0f8d3c6e13a864b19a750c50175cf740..3c9ccd83fbd5801f24c65f1cfef6c7190ab4c3fb 100644 --- a/package.json +++ b/package.json @@ -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", @@ -221,4 +221,4 @@ "node": ">= 12.18.3", "yarn": ">= 1.22.0" } -} \ No newline at end of file +} diff --git a/www/js/config.js b/www/js/config.js index 0027636ef2017dcd29ec16061c4429d103dbd6b8..70fef5e8b0e49330b5c9cbd875c347b1a6d70ed5 100644 --- a/www/js/config.js +++ b/www/js/config.js @@ -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-03-03T20:44:36.248Z", + "build": "2021-06-22T13:41:45.032Z", "newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new" })