From da1d5eaba106d97933a9c3549f3b502fff61f5e4 Mon Sep 17 00:00:00 2001 From: Dominik Pschenitschni Date: Fri, 4 Nov 2022 18:29:02 +0100 Subject: [PATCH 1/5] feat(ci): use 'always' for pull --- .drone.yml | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/.drone.yml b/.drone.yml index 90609688e..ca515d68b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,7 +22,7 @@ steps: # Disabled until we figure out why it is so slow # - name: restore-cache # image: meltwater/drone-cache:dev -# pull: true +# pull: always # environment: # AWS_ACCESS_KEY_ID: # from_secret: cache_aws_access_key_id @@ -41,7 +41,7 @@ steps: - name: dependencies image: node:18-alpine - pull: true + pull: always environment: PNPM_CACHE_FOLDER: .cache/pnpm CYPRESS_CACHE_FOLDER: .cache/cypress @@ -53,7 +53,7 @@ steps: - name: lint image: node:18-alpine - pull: true + pull: always environment: PNPM_CACHE_FOLDER: .cache/pnpm commands: @@ -64,7 +64,7 @@ steps: - name: build-prod image: node:18-alpine - pull: true + pull: always environment: PNPM_CACHE_FOLDER: .cache/pnpm commands: @@ -75,7 +75,7 @@ steps: - name: test-unit image: node:18-alpine - pull: true + pull: always commands: - corepack enable && pnpm config set store-dir .cache/pnpm - pnpm run test:unit @@ -85,7 +85,7 @@ steps: - name: typecheck failure: ignore image: node:18-alpine - pull: true + pull: always environment: PNPM_CACHE_FOLDER: .cache/pnpm commands: @@ -96,7 +96,7 @@ steps: - name: test-frontend image: cypress/browsers:node16.14.0-chrome99-ff97 - pull: true + pull: always environment: CYPRESS_API_URL: http://api:3456/api/v1 CYPRESS_TEST_SECRET: averyLongSecretToSe33dtheDB @@ -116,7 +116,7 @@ steps: # - name: rebuild-cache # image: meltwater/drone-cache:dev -# pull: true +# pull: always # environment: # AWS_ACCESS_KEY_ID: # from_secret: cache_aws_access_key_id @@ -136,7 +136,7 @@ steps: - name: deploy-preview image: node:18-alpine - pull: true + pull: always environment: NETLIFY_AUTH_TOKEN: from_secret: netlify_auth_token @@ -179,7 +179,7 @@ steps: # - name: restore-cache # image: meltwater/drone-cache:dev -# pull: true +# pull: always # environment: # AWS_ACCESS_KEY_ID: # from_secret: cache_aws_access_key_id @@ -197,8 +197,7 @@ steps: - name: build image: node:18-alpine - pull: true - group: build-static + pull: always environment: PNPM_CACHE_FOLDER: .cache/pnpm commands: @@ -214,7 +213,7 @@ steps: - name: static image: kolaente/zip - pull: true + pull: always commands: - cd dist - zip -r ../vikunja-frontend-unstable.zip * @@ -223,7 +222,7 @@ steps: - name: release image: plugins/s3 - pull: true + pull: always settings: bucket: vikunja-releases access_key: @@ -256,7 +255,7 @@ steps: # - name: restore-cache # image: meltwater/drone-cache:dev -# pull: true +# pull: always # environment: # AWS_ACCESS_KEY_ID: # from_secret: cache_aws_access_key_id @@ -274,8 +273,7 @@ steps: - name: build image: node:18-alpine - pull: true - group: build-static + pull: always environment: PNPM_CACHE_FOLDER: .cache/pnpm commands: @@ -291,7 +289,7 @@ steps: - name: static image: kolaente/zip - pull: true + pull: always commands: - cd dist - zip -r ../vikunja-frontend-${DRONE_TAG##v}.zip * @@ -300,7 +298,7 @@ steps: - name: release image: plugins/s3 - pull: true + pull: always settings: bucket: vikunja-releases access_key: @@ -361,7 +359,7 @@ trigger: steps: - name: docker-unstable image: plugins/docker:linux-arm - pull: true + pull: always settings: username: from_secret: docker_username @@ -380,7 +378,7 @@ steps: - name: docker-version image: plugins/docker:linux-arm - pull: true + pull: always settings: username: from_secret: docker_username @@ -400,7 +398,7 @@ steps: - name: docker-unstable-arm64 image: plugins/docker:linux-arm64 - pull: true + pull: always settings: username: from_secret: docker_username @@ -419,7 +417,7 @@ steps: - name: docker-version-arm64 image: plugins/docker:linux-arm64 - pull: true + pull: always settings: username: from_secret: docker_username @@ -461,7 +459,7 @@ trigger: steps: - name: docker-unstable image: plugins/docker:linux-amd64 - pull: true + pull: always settings: username: from_secret: docker_username @@ -478,7 +476,7 @@ steps: - name: docker-version image: plugins/docker:linux-amd64 - pull: true + pull: always settings: username: from_secret: docker_username -- 2.40.1 From 678dc8ef515e18a1972dd67e750a751ecf2e692f Mon Sep 17 00:00:00 2001 From: Dominik Pschenitschni Date: Sat, 5 Nov 2022 14:24:24 +0100 Subject: [PATCH 2/5] feat(ci): add kind everywhere --- .drone.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.drone.yml b/.drone.yml index ca515d68b..8d74baec0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,5 +1,6 @@ --- kind: pipeline +type: docker name: build trigger: @@ -160,6 +161,7 @@ steps: --- kind: pipeline +type: docker name: release-latest depends_on: @@ -238,6 +240,7 @@ steps: --- kind: pipeline +type: docker name: release-version depends_on: @@ -314,6 +317,7 @@ steps: --- kind: pipeline +type: docker name: trigger-desktop-update trigger: -- 2.40.1 From 906b3a5cdf9b3f0264cead440fe6e02a517ec47b Mon Sep 17 00:00:00 2001 From: Dominik Pschenitschni Date: Sat, 5 Nov 2022 14:26:15 +0100 Subject: [PATCH 3/5] feat(ci): update cypress image --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 8d74baec0..5441288c6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -96,7 +96,7 @@ steps: - dependencies - name: test-frontend - image: cypress/browsers:node16.14.0-chrome99-ff97 + image: cypress/browsers:node18.12.0-chrome106-ff106 pull: always environment: CYPRESS_API_URL: http://api:3456/api/v1 -- 2.40.1 From 4a5f1a783a8981ca0b296b07af32a85cee1f47a2 Mon Sep 17 00:00:00 2001 From: Dominik Pschenitschni Date: Sat, 5 Nov 2022 14:30:04 +0100 Subject: [PATCH 4/5] fix(ci): cache folder name --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 5441288c6..23fc41a89 100644 --- a/.drone.yml +++ b/.drone.yml @@ -204,7 +204,7 @@ steps: PNPM_CACHE_FOLDER: .cache/pnpm commands: - apk add git - - corepack enable && pnpm config set store-dir .cache/.pnp + - corepack enable && pnpm config set store-dir .cache/.pnpm - pnpm install --fetch-timeout 100000 --frozen-lockfile - pnpm run lint - "echo '{\"VERSION\": \"'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'\"}' > src/version.json" -- 2.40.1 From d5efe9f656730febfbc1d83637cf75b6b6e685d7 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 8 Nov 2022 15:39:28 +0100 Subject: [PATCH 5/5] chore(ci): sign drone config --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 23fc41a89..046754b02 100644 --- a/.drone.yml +++ b/.drone.yml @@ -663,6 +663,6 @@ steps: from_secret: crowdin_key --- kind: signature -hmac: 5dc7ab785b6e4d1611fc2851971e23c444d93d4988517f116e02e8c4d1af82f3 +hmac: 6784e836f6568c67abfb909449c6e845cc73cbe9a31e9e7ad9166a0eb59e30a2 ... -- 2.40.1