Skip to content

Commit 9a2cd1b

Browse files
Revert "fix(build): corepackのバグの回避 (misskey-dev#15387)"
This reverts commit 9c70a4e.
1 parent 2a96e39 commit 9a2cd1b

16 files changed

+1
-53
lines changed

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

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

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

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

.github/workflows/lint.yml

-4
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ 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-
3531
jobs:
3632
pnpm_install:
3733
runs-on: ubuntu-latest

.github/workflows/locale.yml

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

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

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

77
workflow_dispatch:
88

9-
env:
10-
COREPACK_DEFAULT_TO_LATEST: 0
11-
129
jobs:
1310
publish-misskey-js:
1411
name: Publish misskey-js

.github/workflows/storybook.yml

-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ 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-
1916
jobs:
2017
build:
2118
# chromatic is not likely to be available for fork repositories, so we disable for fork repositories.

.github/workflows/test-backend.yml

-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ on:
1818
- packages/misskey-js/**
1919
- .github/workflows/test-backend.yml
2020
- .github/misskey/test.yml
21-
22-
env:
23-
COREPACK_DEFAULT_TO_LATEST: 0
24-
2521
jobs:
2622
unit:
2723
name: Unit tests (backend)

.github/workflows/test-federation.yml

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

18-
env:
19-
COREPACK_DEFAULT_TO_LATEST: 0
20-
2118
jobs:
2219
test:
2320
name: Federation test

.github/workflows/test-frontend.yml

-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ on:
2222
- packages/backend/**
2323
- .github/workflows/test-frontend.yml
2424
- .github/misskey/test.yml
25-
26-
env:
27-
COREPACK_DEFAULT_TO_LATEST: 0
28-
2925
jobs:
3026
vitest:
3127
name: Unit tests (frontend)

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

-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ on:
1414
paths:
1515
- packages/misskey-js/**
1616
- .github/workflows/test-misskey-js.yml
17-
18-
env:
19-
COREPACK_DEFAULT_TO_LATEST: 0
20-
2117
jobs:
2218
test:
2319
name: Unit tests (misskey.js)

.github/workflows/test-production.yml

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

1010
env:
1111
NODE_ENV: production
12-
COREPACK_DEFAULT_TO_LATEST: 0
1312

1413
jobs:
1514
production:

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

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

CHANGELOG.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@
5555
## 2025.2.0
5656

5757
### General
58-
- Fix: Docker のビルドに失敗する問題を修正
59-
(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/883)
58+
-
6059

6160
### Client
6261
- Fix: パスキーでパスワードレスログインが出来ない問題を修正

Dockerfile

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

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

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

4745
FROM --platform=$TARGETPLATFORM node:${NODE_VERSION} AS target-builder
4846

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

7369
ARG UID="991"
7470
ARG GID="991"
75-
ENV COREPACK_DEFAULT_TO_LATEST=0
7671

7772
RUN apt-get update \
7873
&& apt-get install -y --no-install-recommends \

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

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

packages/backend/test-federation/compose.yml

-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ services:
2929
environment:
3030
- NODE_ENV=development
3131
- NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/rootCA.crt
32-
- COREPACK_DEFAULT_TO_LATEST=0
3332
volumes:
3433
- type: bind
3534
source: ../package.json
@@ -90,8 +89,6 @@ services:
9089
depends_on:
9190
redis.test:
9291
condition: service_healthy
93-
environment:
94-
- COREPACK_DEFAULT_TO_LATEST=0
9592
volumes:
9693
- type: bind
9794
source: ../package.json

0 commit comments

Comments
 (0)