mirror of
https://github.com/mastodon/mastodon.git
synced 2025-05-07 12:16:14 +00:00
Merge 558f54cab2
into 8b34daf254
This commit is contained in:
commit
c894114a39
2
.github/actions/setup-javascript/action.yml
vendored
2
.github/actions/setup-javascript/action.yml
vendored
|
@ -16,7 +16,7 @@ runs:
|
||||||
# The following is needed because we can not use `cache: true` for `setup-node`, as it does not support Corepack yet and mess up with the cache location if ran after Node is installed
|
# The following is needed because we can not use `cache: true` for `setup-node`, as it does not support Corepack yet and mess up with the cache location if ran after Node is installed
|
||||||
- name: Enable corepack
|
- name: Enable corepack
|
||||||
shell: bash
|
shell: bash
|
||||||
run: corepack enable
|
run: npm i -g corepack
|
||||||
|
|
||||||
- name: Get yarn cache directory path
|
- name: Get yarn cache directory path
|
||||||
id: yarn-cache-dir-path
|
id: yarn-cache-dir-path
|
||||||
|
|
|
@ -286,7 +286,7 @@ COPY --from=node /usr/local/lib /usr/local/lib
|
||||||
RUN \
|
RUN \
|
||||||
# Configure Corepack
|
# Configure Corepack
|
||||||
rm /usr/local/bin/yarn*; \
|
rm /usr/local/bin/yarn*; \
|
||||||
corepack enable; \
|
npm i -g corepack; \
|
||||||
corepack prepare --activate;
|
corepack prepare --activate;
|
||||||
|
|
||||||
# hadolint ignore=DL3008
|
# hadolint ignore=DL3008
|
||||||
|
|
2
Vagrantfile
vendored
2
Vagrantfile
vendored
|
@ -115,7 +115,7 @@ gem install bundler foreman
|
||||||
bundle install
|
bundle install
|
||||||
|
|
||||||
# Install node modules
|
# Install node modules
|
||||||
sudo corepack enable
|
sudo npm i -g corepack
|
||||||
corepack prepare
|
corepack prepare
|
||||||
yarn install
|
yarn install
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ FileUtils.chdir APP_ROOT do
|
||||||
system('bundle check') || system!('bundle install')
|
system('bundle check') || system!('bundle install')
|
||||||
|
|
||||||
puts "\n== Installing JS dependencies =="
|
puts "\n== Installing JS dependencies =="
|
||||||
system! 'corepack enable'
|
system! 'npm i -g corepack'
|
||||||
system! 'bin/yarn install --immutable'
|
system! 'bin/yarn install --immutable'
|
||||||
|
|
||||||
puts "\n== Preparing database =="
|
puts "\n== Preparing database =="
|
||||||
|
|
|
@ -96,7 +96,7 @@ RUN \
|
||||||
--mount=type=cache,id=yarn-cache-${TARGETPLATFORM},target=/usr/local/share/.cache/yarn,sharing=locked \
|
--mount=type=cache,id=yarn-cache-${TARGETPLATFORM},target=/usr/local/share/.cache/yarn,sharing=locked \
|
||||||
# Configure Corepack
|
# Configure Corepack
|
||||||
rm /usr/local/bin/yarn*; \
|
rm /usr/local/bin/yarn*; \
|
||||||
corepack enable; \
|
npm i -g corepack; \
|
||||||
corepack prepare --activate;
|
corepack prepare --activate;
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
|
|
Loading…
Reference in New Issue
Block a user