From e8f0b5665161e77bcc961ec0dc57c5b127b93a1f Mon Sep 17 00:00:00 2001 From: Dominik Pschenitschni Date: Sat, 24 Sep 2022 18:34:24 +0200 Subject: [PATCH 1/3] feat: possible fix for pnpm ci errors --- .drone.yml | 16 ++++++++-------- Dockerfile | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index 387d9d02f..77ac41bb9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -46,7 +46,7 @@ steps: PNPM_CACHE_FOLDER: .cache/pnpm CYPRESS_CACHE_FOLDER: .cache/cypress commands: - - corepack enable && corepack prepare pnpm@7.9.3 --activate && pnpm config set store-dir .cache/pnpm + - corepack enable && corepack prepare pnpm@7.12.2 --activate && pnpm config set store-dir .cache/pnpm - pnpm install --fetch-timeout 100000 # depends_on: # - restore-cache @@ -57,7 +57,7 @@ steps: environment: PNPM_CACHE_FOLDER: .cache/pnpm commands: - - corepack enable && corepack prepare pnpm@7.9.3 --activate && pnpm config set store-dir .cache/pnpm + - corepack enable && corepack prepare pnpm@7.12.2 --activate && pnpm config set store-dir .cache/pnpm - pnpm run lint depends_on: - dependencies @@ -68,7 +68,7 @@ steps: environment: PNPM_CACHE_FOLDER: .cache/pnpm commands: - - corepack enable && corepack prepare pnpm@7.9.3 --activate && pnpm config set store-dir .cache/pnpm + - corepack enable && corepack prepare pnpm@7.12.2 --activate && pnpm config set store-dir .cache/pnpm - pnpm run build depends_on: - dependencies @@ -77,7 +77,7 @@ steps: image: node:18-alpine pull: true commands: - - corepack enable && corepack prepare pnpm@7.9.3 --activate && pnpm config set store-dir .cache/pnpm + - corepack enable && corepack prepare pnpm@7.12.2 --activate && pnpm config set store-dir .cache/pnpm - pnpm run test:unit depends_on: - dependencies @@ -89,7 +89,7 @@ steps: environment: PNPM_CACHE_FOLDER: .cache/pnpm commands: - - corepack enable && corepack prepare pnpm@7.9.3 --activate && pnpm config set store-dir .cache/pnpm + - corepack enable && corepack prepare pnpm@7.12.2 --activate && pnpm config set store-dir .cache/pnpm - pnpm run typecheck depends_on: - dependencies @@ -107,7 +107,7 @@ steps: from_secret: cypress_project_key commands: - sed -i 's/localhost/api/g' dist/index.html - - corepack enable && corepack prepare pnpm@7.9.3 --activate && pnpm config set store-dir .cache/pnpm + - corepack enable && corepack prepare pnpm@7.12.2 --activate && pnpm config set store-dir .cache/pnpm - pnpm cypress install - pnpm run serve:dist & npx wait-on http://localhost:4173 - pnpm run test:frontend --browser chrome --record @@ -202,7 +202,7 @@ steps: environment: PNPM_CACHE_FOLDER: .cache/pnpm commands: - - corepack enable && corepack prepare pnpm@7.9.3 --activate && pnpm config set store-dir .cache/.pnp + - corepack enable && corepack prepare pnpm@7.12.2 --activate && pnpm config set store-dir .cache/.pnp - pnpm install --fetch-timeout 100000 - pnpm run lint - "echo '{\"VERSION\": \"'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'\"}' > src/version.json" @@ -278,7 +278,7 @@ steps: environment: PNPM_CACHE_FOLDER: .cache/pnpm commands: - - corepack enable && corepack prepare pnpm@7.9.3 --activate && pnpm config set store-dir .cache/pnpm + - corepack enable && corepack prepare pnpm@7.12.2 --activate && pnpm config set store-dir .cache/pnpm - pnpm install --fetch-timeout 100000 - pnpm run lint - "echo '{\"VERSION\": \"'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'\"}' > src/version.json" diff --git a/Dockerfile b/Dockerfile index 07a36281c..07a41593e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,16 +21,16 @@ COPY pnpm-lock.yaml ./ RUN \ # https://pnpm.io/installation#using-corepack corepack enable && \ - corepack prepare pnpm@7.9.3 --activate && \ + corepack prepare pnpm@7.12.2 --activate && \ # Build the frontend - pnpm fetch + pnpm fetch --prod ADD . ./ RUN apk add --no-cache git RUN \ - pnpm install --offline && \ + pnpm install -r --offline --prod && \ echo '{"VERSION": "'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'"}' > src/version.json && \ pnpm run build From a199fc7a8e7f621ee96b2079e9558987f1350493 Mon Sep 17 00:00:00 2001 From: Dominik Pschenitschni Date: Mon, 26 Sep 2022 14:49:48 +0200 Subject: [PATCH 2/3] fix: don't use corepack prepare at all --- .drone.yml | 16 ++++++++-------- Dockerfile | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 77ac41bb9..9c1a6f573 100644 --- a/.drone.yml +++ b/.drone.yml @@ -46,7 +46,7 @@ steps: PNPM_CACHE_FOLDER: .cache/pnpm CYPRESS_CACHE_FOLDER: .cache/cypress commands: - - corepack enable && corepack prepare pnpm@7.12.2 --activate && pnpm config set store-dir .cache/pnpm + - corepack enable && pnpm config set store-dir .cache/pnpm - pnpm install --fetch-timeout 100000 # depends_on: # - restore-cache @@ -57,7 +57,7 @@ steps: environment: PNPM_CACHE_FOLDER: .cache/pnpm commands: - - corepack enable && corepack prepare pnpm@7.12.2 --activate && pnpm config set store-dir .cache/pnpm + - corepack enable && pnpm config set store-dir .cache/pnpm - pnpm run lint depends_on: - dependencies @@ -68,7 +68,7 @@ steps: environment: PNPM_CACHE_FOLDER: .cache/pnpm commands: - - corepack enable && corepack prepare pnpm@7.12.2 --activate && pnpm config set store-dir .cache/pnpm + - corepack enable && pnpm config set store-dir .cache/pnpm - pnpm run build depends_on: - dependencies @@ -77,7 +77,7 @@ steps: image: node:18-alpine pull: true commands: - - corepack enable && corepack prepare pnpm@7.12.2 --activate && pnpm config set store-dir .cache/pnpm + - corepack enable && pnpm config set store-dir .cache/pnpm - pnpm run test:unit depends_on: - dependencies @@ -89,7 +89,7 @@ steps: environment: PNPM_CACHE_FOLDER: .cache/pnpm commands: - - corepack enable && corepack prepare pnpm@7.12.2 --activate && pnpm config set store-dir .cache/pnpm + - corepack enable && pnpm config set store-dir .cache/pnpm - pnpm run typecheck depends_on: - dependencies @@ -107,7 +107,7 @@ steps: from_secret: cypress_project_key commands: - sed -i 's/localhost/api/g' dist/index.html - - corepack enable && corepack prepare pnpm@7.12.2 --activate && pnpm config set store-dir .cache/pnpm + - corepack enable && pnpm config set store-dir .cache/pnpm - pnpm cypress install - pnpm run serve:dist & npx wait-on http://localhost:4173 - pnpm run test:frontend --browser chrome --record @@ -202,7 +202,7 @@ steps: environment: PNPM_CACHE_FOLDER: .cache/pnpm commands: - - corepack enable && corepack prepare pnpm@7.12.2 --activate && pnpm config set store-dir .cache/.pnp + - corepack enable && pnpm config set store-dir .cache/.pnp - pnpm install --fetch-timeout 100000 - pnpm run lint - "echo '{\"VERSION\": \"'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'\"}' > src/version.json" @@ -278,7 +278,7 @@ steps: environment: PNPM_CACHE_FOLDER: .cache/pnpm commands: - - corepack enable && corepack prepare pnpm@7.12.2 --activate && pnpm config set store-dir .cache/pnpm + - corepack enable && pnpm config set store-dir .cache/pnpm - pnpm install --fetch-timeout 100000 - pnpm run lint - "echo '{\"VERSION\": \"'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'\"}' > src/version.json" diff --git a/Dockerfile b/Dockerfile index 07a41593e..bc702b127 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,8 @@ COPY pnpm-lock.yaml ./ RUN \ # https://pnpm.io/installation#using-corepack corepack enable && \ - corepack prepare pnpm@7.12.2 --activate && \ + # we don't use corepack prepare here by intend since + # we have renovate to keep our dependencies up to date # Build the frontend pnpm fetch --prod From f4a5f5940068fd5783d6876928589976d8ba8bb4 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 27 Sep 2022 17:18:38 +0200 Subject: [PATCH 3/3] chore(ci): sign drone config --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 9c1a6f573..e18f871f2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -659,6 +659,6 @@ steps: from_secret: crowdin_key --- kind: signature -hmac: 9eccb4a9999236be0f772c4cbe7ccce2875faa57f32de179bd75cf0df4124d00 +hmac: c885a0e50db729842402494aa645dd3ac662828b691108550f6bf302158295ba ...