Skip to content
Snippets Groups Projects
Commit b3f1b703 authored by Robert Speicher's avatar Robert Speicher Committed by Mike Greiling
Browse files

Use yarn instead of npm in Makefile

parent 8e123b62
No related branches found
No related tags found
1 merge request!275Use yarn instead of npm in Makefile
This commit is part of merge request !275. Comments created here will be created in the context of that merge request.
Loading
@@ -49,6 +49,7 @@
Loading
@@ -49,6 +49,7 @@
/.gitlab-shell-bundle /.gitlab-shell-bundle
/.gitlab-bundle /.gitlab-bundle
/.gitlab-npm /.gitlab-npm
/.gitlab-yarn
/gem/*.gem /gem/*.gem
/gitlab-runner-config.toml /gitlab-runner-config.toml
/.gdk-install-root /.gdk-install-root
Loading
Loading
Loading
@@ -21,7 +21,7 @@ all: gitlab-setup gitlab-shell-setup gitlab-workhorse-setup support-setup gitaly
Loading
@@ -21,7 +21,7 @@ all: gitlab-setup gitlab-shell-setup gitlab-workhorse-setup support-setup gitaly
   
# Set up the GitLab Rails app # Set up the GitLab Rails app
   
gitlab-setup: gitlab/.git gitlab-config bundler .gitlab-bundle .gitlab-npm gitlab-setup: gitlab/.git gitlab-config bundler .gitlab-bundle .gitlab-yarn
   
gitlab/.git: gitlab/.git:
git clone ${gitlab_repo} gitlab git clone ${gitlab_repo} gitlab
Loading
@@ -51,8 +51,8 @@ gitlab/public/uploads:
Loading
@@ -51,8 +51,8 @@ gitlab/public/uploads:
cd ${gitlab_development_root}/gitlab && bundle install --without mysql production --jobs 4 cd ${gitlab_development_root}/gitlab && bundle install --without mysql production --jobs 4
touch $@ touch $@
   
.gitlab-npm: .gitlab-yarn:
cd ${gitlab_development_root}/gitlab && npm install cd ${gitlab_development_root}/gitlab && yarn install
touch $@ touch $@
   
.PHONY: bundler .PHONY: bundler
Loading
@@ -109,7 +109,6 @@ gitlab-update: gitlab/.git/pull gitlab-setup
Loading
@@ -109,7 +109,6 @@ gitlab-update: gitlab/.git/pull gitlab-setup
@echo "" @echo ""
cd ${gitlab_development_root}/gitlab && \ cd ${gitlab_development_root}/gitlab && \
bundle exec rake db:migrate db:test:prepare bundle exec rake db:migrate db:test:prepare
cd ${gitlab_development_root}/gitlab && npm prune
   
gitlab-shell-update: gitlab-shell/.git/pull gitlab-shell-setup gitlab-shell-update: gitlab-shell/.git/pull gitlab-shell-setup
   
Loading
@@ -312,6 +311,7 @@ clean-config:
Loading
@@ -312,6 +311,7 @@ clean-config:
nginx/conf/nginx.conf \ nginx/conf/nginx.conf \
   
unlock-dependency-installers: unlock-dependency-installers:
rm -f .gitlab-npm \ rm -f \
.gitlab-bundle \ .gitlab-bundle \
.gitlab-shell-bundle \ .gitlab-shell-bundle \
.gitlab-yarn
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment