diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 103547d7d21005ac10eedf9c2db7e59f6bcf57ba..be00aa7097bfcec8af70796b47681c510d66860a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ testCommit: variables: POSTGRES_PASSWORD: ci script: - - apt-get update && apt-get install -y git wget curl build-essential python3 + - apt-get update && apt-get install -y git wget curl build-essential python3 - cp .config/ci.yml .config/default.yml - corepack enable - corepack prepare pnpm@latest --activate @@ -55,6 +55,8 @@ getImageTag: only: - stable - develop + - tags + buildDocker: stage: deploy needs: @@ -78,6 +80,8 @@ buildDocker: only: - stable - develop + - tags + mergeManifests: stage: deploy needs: @@ -103,3 +107,4 @@ mergeManifests: only: - stable - develop + - tags diff --git a/package.json b/package.json index 5e89cba218a9cc778f55af21b32db079a4699b2c..f00122529052e4fac821774cf99a1cafb91d8e75 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sharkey", - "version": "2024.3.1", + "version": "2024.3.2-devel", "codename": "shonk", "repository": { "type": "git", diff --git a/packages/backend/src/queue/processors/ImportNotesProcessorService.ts b/packages/backend/src/queue/processors/ImportNotesProcessorService.ts index 67e2eb7407b81f41bd549c567a0accee3e099f91..7cef858c514b61ebec2f0bae0fe4f7aee3ab98db 100644 --- a/packages/backend/src/queue/processors/ImportNotesProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportNotesProcessorService.ts @@ -421,7 +421,7 @@ export class ImportNotesProcessorService { if (file.name) { this.driveService.updateFile(exists, { comment: file.name }, user); } - + files.push(exists); } }