From 034a8bd5683e5036b90d0028955e678f351fd615 Mon Sep 17 00:00:00 2001 From: Lukas Eipert Date: Wed, 5 Feb 2020 21:12:04 +0100 Subject: [PATCH] Update to yarn 1.21.1 Last year there was a recommended security update: https://classic.yarnpkg.com/blog/2019/07/12/recommended-security-update/ This updates yarn to the latest stable version --- .gitlab-ci.yml | 48 +++++++++++++++++----------------- Dockerfile.danger | 2 +- scripts/custom-docker-build | 1 + scripts/install-node | 2 +- scripts/install-www-gitlab-com | 2 +- 5 files changed, 28 insertions(+), 27 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc520a3..ba0fc58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,22 +63,22 @@ ruby-2.6-golang-1.12-git-2.24 test: *test_custom ruby-2.6-golang-1.13-git-2.24 test: *test_custom # Used by GitLab: https://gitlab.com/gitlab-org/gitlab/blob/master/.gitlab-ci.yml -ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.34 test: *test_custom -ruby-2.6.3-golang-1.12-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.34 test: *test_custom -ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.34 test: *test_custom -ruby-2.6.3-golang-1.12-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.34 test: *test_custom -ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-11-graphicsmagick-1.3.34 test: *test_custom -ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.34 test: *test_custom -ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.34 test: *test_custom -ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-11-graphicsmagick-1.3.34 test: *test_custom +ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34 test: *test_custom +ruby-2.6.3-golang-1.12-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34 test: *test_custom +ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34 test: *test_custom +ruby-2.6.3-golang-1.12-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34 test: *test_custom +ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34 test: *test_custom +ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34 test: *test_custom +ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34 test: *test_custom +ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34 test: *test_custom # gitlab:assets:compile step -ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.34-docker-19.03.1 test: *test_custom -ruby-2.6.3-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.34-docker-19.03.1 test: *test_custom -ruby-2.6.5-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.34-docker-19.03.1 test: *test_custom +ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1 test: *test_custom +ruby-2.6.3-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1 test: *test_custom +ruby-2.6.5-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1 test: *test_custom # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml -ruby-2.6.3-git-2.22-chrome-74.0-node-12.x-yarn-1.16-docker-19.03.1 test: *test_custom +ruby-2.6.3-git-2.22-chrome-74.0-node-12.x-yarn-1.21-docker-19.03.1 test: *test_custom # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/ ruby-2.3-ansible-2.5.1-terraform-0.11 test: *test_custom @@ -124,22 +124,22 @@ ruby-2.6-golang-1.12-git-2.24: *build_and_deploy_custom ruby-2.6-golang-1.13-git-2.24: *build_and_deploy_custom # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml -ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.34: *build_and_deploy_custom -ruby-2.6.3-golang-1.12-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.34: *build_and_deploy_custom -ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.34: *build_and_deploy_custom -ruby-2.6.3-golang-1.12-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.34: *build_and_deploy_custom -ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom -ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.34: *build_and_deploy_custom -ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.34: *build_and_deploy_custom -ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom +ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34: *build_and_deploy_custom +ruby-2.6.3-golang-1.12-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34: *build_and_deploy_custom +ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34: *build_and_deploy_custom +ruby-2.6.3-golang-1.12-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34: *build_and_deploy_custom +ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom +ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34: *build_and_deploy_custom +ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34: *build_and_deploy_custom +ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom # gitlab:assets:compile step -ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.34-docker-19.03.1: *build_and_deploy_custom -ruby-2.6.3-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.34-docker-19.03.1: *build_and_deploy_custom -ruby-2.6.5-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.34-docker-19.03.1: *build_and_deploy_custom +ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1: *build_and_deploy_custom +ruby-2.6.3-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1: *build_and_deploy_custom +ruby-2.6.5-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1: *build_and_deploy_custom # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml -ruby-2.6.3-git-2.22-chrome-74.0-node-12.x-yarn-1.16-docker-19.03.1: *build_and_deploy_custom +ruby-2.6.3-git-2.22-chrome-74.0-node-12.x-yarn-1.21-docker-19.03.1: *build_and_deploy_custom # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/ ruby-2.3-ansible-2.5.1-terraform-0.11: *build_and_deploy_custom diff --git a/Dockerfile.danger b/Dockerfile.danger index 9785391..5269e76 100644 --- a/Dockerfile.danger +++ b/Dockerfile.danger @@ -10,7 +10,7 @@ ADD /scripts/ /scripts/ RUN apt-get update \ && apt-get install -y git \ - && /scripts/install-node 12.4.0 1.16.0-1 \ + && /scripts/install-node 12.4.0 1.21.1-1 \ && yarn global add alex@7 \ && yarn cache clean \ && apt-get autoremove -yq \ diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index 7bb8634..d6a5c05 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -114,6 +114,7 @@ function print_yarn_args() { case "$1" in 1.12) YARN_INSTALL_VERSION=1.12.3-1 ;; 1.16) YARN_INSTALL_VERSION=1.16.0-1 ;; + 1.21) YARN_INSTALL_VERSION=1.21.1-1 ;; *) echo "Unknown yarn version $1"; exit 1; esac printf -- "--build-arg YARN_INSTALL_VERSION=%s " "$YARN_INSTALL_VERSION" diff --git a/scripts/install-node b/scripts/install-node index b4a9ffa..724d191 100755 --- a/scripts/install-node +++ b/scripts/install-node @@ -3,7 +3,7 @@ set -xeuo pipefail IFS=$'\n\t' NODE_INSTALL_VERSION=${1:-12.4.0} -YARN_INSTALL_VERSION=${2:-1.16.0-1} +YARN_INSTALL_VERSION=${2:-1.21.1-1} # Map MAJOR.MINOR.patch -> MAJOR.x NODE_MAJOR=`echo $NODE_INSTALL_VERSION | sed -r -e "s/([0-9]+)\.[0-9]+.*/\1\.x/g"` diff --git a/scripts/install-www-gitlab-com b/scripts/install-www-gitlab-com index 1a5973a..fa0988a 100755 --- a/scripts/install-www-gitlab-com +++ b/scripts/install-www-gitlab-com @@ -23,7 +23,7 @@ apt-get install -yq --no-install-recommends imagemagick # Installing node & yarn NODE_INSTALL_VERSION=12.4.0 -YARN_INSTALL_VERSION=1.16.0-1 +YARN_INSTALL_VERSION=1.21.1-1 /scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version # Installing gitlab-runner