Remove dependency on npm and use yarnpkg directly instead
This commit is contained in:
parent
ebd740859e
commit
632e36e758
3 changed files with 5 additions and 8 deletions
6
debian/control
vendored
6
debian/control
vendored
|
@ -224,8 +224,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||||
#
|
#
|
||||||
ruby-webpack-rails (>= 0.9.10~),
|
ruby-webpack-rails (>= 0.9.10~),
|
||||||
# Many node modules are still in NEW, some are yet to be packaged
|
# Many node modules are still in NEW, some are yet to be packaged
|
||||||
# so we use npm to downlod those and hence gitlab is in contrib
|
# so we use yarn to downlod those and hence gitlab is in contrib
|
||||||
npm,
|
yarnpkg,
|
||||||
ruby-rack-proxy (>= 0.6~),
|
ruby-rack-proxy (>= 0.6~),
|
||||||
#
|
#
|
||||||
ruby-sass-rails (>= 5.0.6~),
|
ruby-sass-rails (>= 5.0.6~),
|
||||||
|
@ -359,7 +359,7 @@ Description: git powered software platform to collaborate on code (non-omnibus)
|
||||||
Unlike the official package from GitLab Inc., this package does not use
|
Unlike the official package from GitLab Inc., this package does not use
|
||||||
omnibus.
|
omnibus.
|
||||||
.
|
.
|
||||||
Note: Currently this package is in contrib because it uses npm to install
|
Note: Currently this package is in contrib because it uses yarn to install
|
||||||
front end dependencies.
|
front end dependencies.
|
||||||
|
|
||||||
Package: gitlab-common
|
Package: gitlab-common
|
||||||
|
|
2
debian/copyright
vendored
2
debian/copyright
vendored
|
@ -3,7 +3,7 @@ Upstream-Name: gitlab-ce
|
||||||
Source: https://gitlab.com/gitlab-org/gitlab-ce
|
Source: https://gitlab.com/gitlab-org/gitlab-ce
|
||||||
Files-Excluded:
|
Files-Excluded:
|
||||||
Comment: This package installs front end dependencies (nodejs modules) using
|
Comment: This package installs front end dependencies (nodejs modules) using
|
||||||
npm/yarm package managers from outside debian. This can go to main when all
|
yarn package manager from outside debian. This can go to main when all
|
||||||
those nodejs modules are packaged in main.
|
those nodejs modules are packaged in main.
|
||||||
|
|
||||||
Files: *
|
Files: *
|
||||||
|
|
5
debian/rake-tasks.sh
vendored
5
debian/rake-tasks.sh
vendored
|
@ -31,10 +31,7 @@ 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/yarn'
|
runuser -u ${gitlab_user} -- sh -c 'yarnpkg --frozen-lockfile install'
|
||||||
runuser -u ${gitlab_user} -- sh -c 'cd /var/lib/gitlab/yarn; npm install yarn'
|
|
||||||
runuser -u ${gitlab_user} -- sh -c '/var/lib/gitlab/yarn/node_modules/.bin/yarn --frozen-lockfile install'
|
|
||||||
export PATH=$PATH:/var/lib/gitlab/yarn/node_modules/.bin
|
|
||||||
# Remove write permissions of .yarn-metadata.json files
|
# Remove write permissions of .yarn-metadata.json files
|
||||||
runuser -u ${gitlab_user} -- sh -c 'find /var/lib/gitlab/.cache/yarn/v4/ -name .yarn-metadata.json -perm -a=w -exec chmod 644 {} \;'
|
runuser -u ${gitlab_user} -- sh -c 'find /var/lib/gitlab/.cache/yarn/v4/ -name .yarn-metadata.json -perm -a=w -exec chmod 644 {} \;'
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue