Prevent vite_ruby to run yarn, always

This commit is contained in:
Renaud Chaput 2025-04-23 16:02:21 +02:00
parent 1362a71d8c
commit b7d46a0c2c
No known key found for this signature in database
GPG Key ID: BCFC859D49B46990
3 changed files with 3 additions and 3 deletions

View File

@ -58,8 +58,6 @@ jobs:
${{ matrix.mode }}-assets
- name: Precompile assets
env:
VITE_RUBY_SKIP_ASSETS_PRECOMPILE_INSTALL: true
run: |-
bin/rails assets:precompile

View File

@ -308,7 +308,6 @@ RUN \
# Use Ruby on Rails to create Mastodon assets
SECRET_KEY_BASE_DUMMY=1 \
# Do not run `yarn` when precompiling assets, we already ran it before
VITE_RUBY_SKIP_ASSETS_PRECOMPILE_INSTALL=true \
bundle exec rails assets:precompile; \
# Cleanup temporary files
rm -fr /opt/mastodon/tmp;

View File

@ -17,3 +17,6 @@ if Rake::Task.task_defined?('assets:precompile')
Rake::Task['assets:generate_static_pages'].invoke
end
end
# We don't want vite_ruby to run yarn, we do that in a separate step
Rake::Task['vite:install_dependencies'].clear