From c09ee6e32e0adf99fcbec72fbf0ece8056907d85 Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Thu, 5 Jul 2018 19:06:58 +0200
Subject: [PATCH] yarn is already installed on docker image 1.2.0
---
.gitlab-ci.yml | 2 +-
release/arch/linux/build-lin.sh | 9 ---------
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d60d087dc..bbcee2e4f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,7 +92,7 @@ test:
.build_releases: &build_releases
stage: package
allow_failure: false
- image: duniter/release-builder:v1.0.1
+ image: duniter/release-builder:v1.2.0
tags:
- redshift-duniter-builder
artifacts:
diff --git a/release/arch/linux/build-lin.sh b/release/arch/linux/build-lin.sh
index e6e971963..05468ba0d 100644
--- a/release/arch/linux/build-lin.sh
+++ b/release/arch/linux/build-lin.sh
@@ -15,14 +15,6 @@ fi
# Functions
# ---------
-# Install yarn, npm equivalent
-# -
-# Parameters:
-install_yarn() {
- curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
- echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
- apt-get update && apt-get install yarn
-}
# Copy nw.js compiled module released library to node libraries.
# -
# Parameters:
@@ -135,7 +127,6 @@ DUNITER_UI_VER="1.6.x"
nvm install ${NVER} || exit 1
nvm use ${NVER} || exit 1
-install_yarn
yarn global node-pre-gyp || exit 1
yarn global nw-gyp || exit 1
--
GitLab