realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Switch to yarn 2.x with node-modules plugin

Browse source
This commit is contained in:
Pirate Praveen 2020-12-21 03:16:23 +05:30
parent 87d79396df
commit 43df5d0233
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
debian/gitlab.links vendored
View file

@ -3,9 +3,12 @@ var/lib/gitlab/shared usr/share/gitlab/shared
var/lib/gitlab/db usr/share/gitlab/db var/lib/gitlab/db usr/share/gitlab/db
var/lib/gitlab/.node_modules usr/share/gitlab/node_modules var/lib/gitlab/.node_modules usr/share/gitlab/node_modules
var/lib/gitlab/yarn.lock usr/share/gitlab/yarn.lock var/lib/gitlab/yarn.lock usr/share/gitlab/yarn.lock
var/lib/gitlab/package.json usr/share/gitlab/package.json
var/lib/gitlab/yarn-error.log usr/share/gitlab/yarn-error.log var/lib/gitlab/yarn-error.log usr/share/gitlab/yarn-error.log
var/lib/gitlab/.ssh usr/share/gitlab/.ssh var/lib/gitlab/.ssh usr/share/gitlab/.ssh
var/lib/gitlab/.bundle usr/share/gitlab/.bundle var/lib/gitlab/.bundle usr/share/gitlab/.bundle
var/lib/gitlab/.yarn usr/share/gitlab/.yarn
var/lib/gitlab/.yarnrc.yml usr/share/gitlab/.yarnrc.yml
var/lib/gitlab/secrets.yml etc/gitlab/secrets.yml var/lib/gitlab/secrets.yml etc/gitlab/secrets.yml
var/lib/gitlab/locale usr/share/gitlab/app/assets/javascripts/locale var/lib/gitlab/locale usr/share/gitlab/app/assets/javascripts/locale
usr/share/gitlab/app/assets/javascripts/locale.static/index.js var/lib/gitlab/locale/index.js usr/share/gitlab/app/assets/javascripts/locale.static/index.js var/lib/gitlab/locale/index.js

2
debian/patches/0710-use-yarnpkg.patch vendored
View file

@ -30,7 +30,7 @@ Yarn executable in debian is yarnpkg
desc 'Install Node dependencies with Yarn' desc 'Install Node dependencies with Yarn'
task install: ['yarn:available'] do task install: ['yarn:available'] do
- unless system('yarn install --pure-lockfile --ignore-engines --prefer-offline') - unless system('yarn install --pure-lockfile --ignore-engines --prefer-offline')
+ unless system('yarnpkg install --pure-lockfile --ignore-engines --prefer-offline') + unless system('yarnpkg install')
abort 'Error: Unable to install node modules.'.color(:red) abort 'Error: Unable to install node modules.'.color(:red)
end end
end end

2
debian/rake-tasks.sh vendored
View file

@ -36,6 +36,8 @@ chmod 0700 ${gitlab_data_dir}/.gitlab_shell_secret
echo "Installing node modules..." echo "Installing node modules..."
runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/.node_modules' runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/.node_modules'
runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/.cache' runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/.cache'
runuser -u ${gitlab_user} -- sh -c 'yarnpkg set version berry'
runuser -u ${gitlab_user} -- sh -c 'if ! grep nodeLinker .yarnrc.yml >/dev/null; then echo "nodeLinker: \"node-modules\"" >>.yarnrc.yml; fi'
runuser -u ${gitlab_user} -- sh -c 'yarnpkg install' runuser -u ${gitlab_user} -- sh -c 'yarnpkg install'
# Remove write permissions of .yarn-metadata.json files # Remove write permissions of .yarn-metadata.json files
runuser -u ${gitlab_user} -- sh -c 'test -d "/var/lib/gitlab/.cache/yarn/v6" && find /var/lib/gitlab/.cache/yarn/v6/ -name .yarn-metadata.json -perm -a=w -exec chmod 644 {} \;' runuser -u ${gitlab_user} -- sh -c 'test -d "/var/lib/gitlab/.cache/yarn/v6" && find /var/lib/gitlab/.cache/yarn/v6/ -name .yarn-metadata.json -perm -a=w -exec chmod 644 {} \;'