Skip to content

Commit 444769f

Browse files
kozakura913kakkokari-gtyihMar0xyanatawa12
committed
fix(build): corepackのバグの回避
Cherry-picked from misskey-dev/misskey#15387 # Conflicts: # .github/workflows/api-cherrypick-js.yml # .github/workflows/test-backend.yml # .github/workflows/test-cherrypick-js.yml # .github/workflows/test-frontend.yml # CHANGELOG.md Co-authored-by: かっこかり <[email protected]> Co-authored-by: Marie <[email protected]> Co-authored-by: anatawa12 <[email protected]>
1 parent d700cf2 commit 444769f

16 files changed

+61
-0
lines changed

.github/workflows/api-cherrypick-js.yml

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
paths:
1010
- packages/cherrypick-js/**
1111
- .github/workflows/api-cherrypick-js.yml
12+
13+
env:
14+
COREPACK_DEFAULT_TO_LATEST: 0
15+
1216
jobs:
1317
report:
1418

.github/workflows/get-api-diff.yml

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
paths:
1010
- packages/backend/**
1111
- .github/workflows/get-api-diff.yml
12+
13+
env:
14+
COREPACK_DEFAULT_TO_LATEST: 0
15+
1216
jobs:
1317
get-from-cherrypick:
1418
runs-on: ubuntu-latest

.github/workflows/lint.yml

+4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ on:
2828
- packages/misskey-reversi/**
2929
- packages/shared/eslint.config.js
3030
- .github/workflows/lint.yml
31+
32+
env:
33+
COREPACK_DEFAULT_TO_LATEST: 0
34+
3135
jobs:
3236
pnpm_install:
3337
runs-on: ubuntu-latest

.github/workflows/locale.yml

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
paths:
1010
- locales/**
1111
- .github/workflows/locale.yml
12+
13+
env:
14+
COREPACK_DEFAULT_TO_LATEST: 0
15+
1216
jobs:
1317
locale_verify:
1418
runs-on: ubuntu-latest

.github/workflows/on-release-created.yml

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66

77
workflow_dispatch:
88

9+
env:
10+
COREPACK_DEFAULT_TO_LATEST: 0
11+
912
jobs:
1013
publish-cherrypick-js:
1114
name: Publish cherrypick-js

.github/workflows/storybook.yml

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ on:
1313
# This is a waste of chromatic build quota, so we don't run storybook CI on pull requests targets master.
1414
- master
1515

16+
env:
17+
COREPACK_DEFAULT_TO_LATEST: 0
18+
1619
jobs:
1720
build:
1821
runs-on: ubuntu-latest

.github/workflows/test-backend.yml

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ on:
1818
- packages/cherrypick-js/**
1919
- .github/workflows/test-backend.yml
2020
- .github/cherrypick/test*.yml
21+
22+
env:
23+
COREPACK_DEFAULT_TO_LATEST: 0
24+
2125
jobs:
2226
unit:
2327
runs-on: ubuntu-latest

.github/workflows/test-cherrypick-js.yml

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ on:
1414
paths:
1515
- packages/cherrypick-js/**
1616
- .github/workflows/test-cherrypick-js.yml
17+
18+
env:
19+
COREPACK_DEFAULT_TO_LATEST: 0
20+
1721
jobs:
1822
test:
1923

.github/workflows/test-federation.yml

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ on:
1515
- packages/cherrypick-js/**
1616
- .github/workflows/test-federation.yml
1717

18+
env:
19+
COREPACK_DEFAULT_TO_LATEST: 0
20+
1821
jobs:
1922
test:
2023
runs-on: ubuntu-latest

.github/workflows/test-frontend.yml

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ on:
2020
# for e2e
2121
- packages/backend/**
2222
- .github/workflows/test-frontend.yml
23+
24+
env:
25+
COREPACK_DEFAULT_TO_LATEST: 0
26+
2327
jobs:
2428
vitest:
2529
runs-on: ubuntu-latest

.github/workflows/test-production.yml

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99

1010
env:
1111
NODE_ENV: production
12+
COREPACK_DEFAULT_TO_LATEST: 0
1213

1314
jobs:
1415
production:

.github/workflows/validate-api-json.yml

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ on:
1212
paths:
1313
- packages/backend/**
1414
- .github/workflows/validate-api-json.yml
15+
16+
env:
17+
COREPACK_DEFAULT_TO_LATEST: 0
18+
1519
jobs:
1620
validate-api-json:
1721
runs-on: ubuntu-latest

CHANGELOG_YOJO.md

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## 1.3.1
2+
Cherrypick 4.13.0
3+
Misskey 2024.10.1
4+
5+
### Release Date
6+
7+
### General
8+
- Fix: Docker のビルドに失敗する問題を修正
9+
(Cherry-picked from https://github.com/misskey-dev/misskey/pull/15387)
10+
111
## 1.3.0
212
Cherrypick 4.13.0
313
Misskey 2024.10.1

Dockerfile

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ ARG NODE_VERSION=20.16.0-bullseye
66

77
FROM --platform=$BUILDPLATFORM node:${NODE_VERSION} AS native-builder
88

9+
ENV COREPACK_DEFAULT_TO_LATEST=0
10+
911
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
1012
--mount=type=cache,target=/var/lib/apt,sharing=locked \
1113
rm -f /etc/apt/apt.conf.d/docker-clean \
@@ -44,6 +46,8 @@ RUN rm -rf .git/
4446

4547
FROM --platform=$TARGETPLATFORM node:${NODE_VERSION} AS target-builder
4648

49+
ENV COREPACK_DEFAULT_TO_LATEST=0
50+
4751
RUN apt-get update \
4852
&& apt-get install -yqq --no-install-recommends \
4953
build-essential
@@ -68,6 +72,7 @@ FROM --platform=$TARGETPLATFORM node:${NODE_VERSION}-slim AS runner
6872

6973
ARG UID="991"
7074
ARG GID="991"
75+
ENV COREPACK_DEFAULT_TO_LATEST=0
7176

7277
RUN apt-get update \
7378
&& apt-get install -y --no-install-recommends \

packages/backend/test-federation/compose.tpl.yml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ services:
1717
- ./.config/docker.env
1818
environment:
1919
- NODE_ENV=production
20+
- COREPACK_DEFAULT_TO_LATEST=0
2021
volumes:
2122
- type: bind
2223
source: ../../../built

packages/backend/test-federation/compose.yml

+3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ services:
2525
environment:
2626
- NODE_ENV=development
2727
- NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/rootCA.crt
28+
- COREPACK_DEFAULT_TO_LATEST=0
2829
volumes:
2930
- type: bind
3031
source: ../package.json
@@ -85,6 +86,8 @@ services:
8586
depends_on:
8687
redis.test:
8788
condition: service_healthy
89+
environment:
90+
- COREPACK_DEFAULT_TO_LATEST=0
8891
volumes:
8992
- type: bind
9093
source: ../package.json

0 commit comments

Comments
 (0)