From f92ef51b762af83e9bd72d04ee2a9347c2b105a1 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 29 Mar 2023 20:26:51 +0200 Subject: [PATCH] Switched ci over to pnpm cache --- .drone.yml | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9d71978..740b085 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,10 +14,10 @@ get: --- kind: secret -name: git_ssh +name: npm_url get: - path: odit-git-bot - name: sshkey + path: odit-npm-cache + name: url --- kind: pipeline @@ -34,8 +34,12 @@ steps: - name: run tests image: registry.odit.services/hub/library/node:19.0.1-alpine3.16 commands: - - yarn - - yarn test:ci + - npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8 + - pnpm i + - pnpm test:ci + environment: + NPM_REGISTRY_URL: + from_secret: npm_url trigger: event: - pull_request @@ -61,10 +65,8 @@ steps: password: from_secret: docker_password build_args: - - NPM_REGISTRY_DOMAIN: - from_secret: npmjs_domain - - NPM_REGISTRY_TOKEN: - from_secret: npmjs_token + - NPM_REGISTRY_URL: + from_secret: npm_url repo: lfk/mailer tags: - dev @@ -84,13 +86,6 @@ clone: disable: true steps: - - name: clone - image: alpine/git - commands: - - git clone $DRONE_REMOTE_URL . - - git checkout dev - - git merge main - - git checkout main - name: build latest image: registry.odit.services/library/drone-kaniko settings: @@ -99,10 +94,8 @@ steps: password: from_secret: docker_password build_args: - - NPM_REGISTRY_DOMAIN: - from_secret: npmjs_domain - - NPM_REGISTRY_TOKEN: - from_secret: npmjs_token + - NPM_REGISTRY_URL: + from_secret: npm_url repo: lfk/mailer tags: - latest @@ -128,10 +121,8 @@ steps: password: from_secret: docker_password build_args: - - NPM_REGISTRY_DOMAIN: - from_secret: npmjs_domain - - NPM_REGISTRY_TOKEN: - from_secret: npmjs_token + - NPM_REGISTRY_URL: + from_secret: npm_url repo: lfk/mailer tags: - "${DRONE_TAG}"