From 63f9dbd5f1b6a024eb07c68b59772f54ab9d937d Mon Sep 17 00:00:00 2001 From: Marie Date: Mon, 3 Feb 2025 01:13:21 +0000 Subject: [PATCH 1/3] pin corepack version disallow corepack from fetching latest manager version; instead use specified version in package.json --- .gitlab-ci.yml | 3 ++- Dockerfile | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4db8bda32e..4b80ba9728 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,12 +10,13 @@ testCommit: - redis variables: POSTGRES_PASSWORD: ci + COREPACK_DEFAULT_TO_LATEST: 0 script: - apt-get update && apt-get install -y git wget curl build-essential python3 ffmpeg - cp .config/ci.yml .config/default.yml - cp .config/ci.yml .config/test.yml - corepack enable - - corepack prepare pnpm@latest --activate + - corepack install - git submodule update --init - pnpm install --frozen-lockfile - pnpm run build diff --git a/Dockerfile b/Dockerfile index 8f7f8c0805..aff4074079 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ FROM node:${NODE_VERSION} as build RUN apk add git linux-headers build-base ENV PYTHONUNBUFFERED=1 +ENV COREPACK_DEFAULT_TO_LATEST=0 RUN apk add --update python3 && ln -sf python3 /usr/bin/python RUN apk add py3-pip py3-setuptools @@ -35,6 +36,7 @@ FROM node:${NODE_VERSION} ARG UID="991" ARG GID="991" +ENV COREPACK_DEFAULT_TO_LATEST=0 RUN apk add ffmpeg tini jemalloc \ && corepack enable \ From 955b6e8c12d41a122b3ebd0ecd17994f076514bc Mon Sep 17 00:00:00 2001 From: dakkar Date: Sun, 2 Mar 2025 18:58:53 +0000 Subject: [PATCH 2/3] bump version --- package.json | 2 +- packages/misskey-js/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 68ca6fd876..e1612a0126 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sharkey", - "version": "2025.2.0-dev", + "version": "2025.2.2", "codename": "shonk", "repository": { "type": "git", diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json index 1b4675b938..010da73a32 100644 --- a/packages/misskey-js/package.json +++ b/packages/misskey-js/package.json @@ -1,7 +1,7 @@ { "type": "module", "name": "misskey-js", - "version": "2025.2.0-dev", + "version": "2025.2.2", "description": "Misskey SDK for JavaScript", "license": "MIT", "main": "./built/index.js", From 18ab08cfe0cc2f4a45d07f1ff4a1dc9d55b9c416 Mon Sep 17 00:00:00 2001 From: Julia Johannesen Date: Sun, 2 Mar 2025 15:54:23 -0500 Subject: [PATCH 3/3] Bump develop version --- package.json | 2 +- packages/misskey-js/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e1612a0126..a02afb7434 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sharkey", - "version": "2025.2.2", + "version": "2025.3.0-dev", "codename": "shonk", "repository": { "type": "git", diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json index 010da73a32..2a3458b4c9 100644 --- a/packages/misskey-js/package.json +++ b/packages/misskey-js/package.json @@ -1,7 +1,7 @@ { "type": "module", "name": "misskey-js", - "version": "2025.2.2", + "version": "2025.3.0-dev", "description": "Misskey SDK for JavaScript", "license": "MIT", "main": "./built/index.js",