From 0832b1e8e4cda5e3562e2c9a6915eb19fd0e4c31 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Tue, 14 Jul 2020 11:10:27 +0200
Subject: [PATCH] Add yarn to the docker image and use yarn in CI
---
.gitlab-ci.yml | 5 ++---
.gitlab-ci/Dockerfile | 4 ++++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3570e9e..2e5fa1a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,5 @@ stages:
test:
stage: test
script:
- - npm install
- - npm run bootstrap
- - npm run test
+ - yarn install
+ - yarn run test
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index debbcc60..a1a8ac79 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -14,8 +14,12 @@ RUN apt-get update && apt-get install -y \
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \
&& rm -rf /var/lib/apt/lists/*
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
+
RUN apt-get update && apt-get install -y \
nodejs \
+ yarn \
chromium \
# libgbm1: newer chromium from puppeteer
libgbm1 \
--
GitLab