diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-03-30 12:44:31 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-03-30 12:44:31 +0000 |
| commit | e6970a0e7c247c988218e4d4e7fbfdf4b96de534 (patch) | |
| tree | 7dbd4298baa9b7605743a0fe0854aaa1f8ae5172 | |
| parent | merge: some validation fixes (!484) (diff) | |
| parent | merge: release 2024.3.2 (!485) (diff) | |
| download | sharkey-e6970a0e7c247c988218e4d4e7fbfdf4b96de534.tar.gz sharkey-e6970a0e7c247c988218e4d4e7fbfdf4b96de534.tar.bz2 sharkey-e6970a0e7c247c988218e4d4e7fbfdf4b96de534.zip | |
Merge branch 'stable' into bump-devel-version
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | packages/backend/src/queue/processors/ImportNotesProcessorService.ts | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 103547d7d2..be00aa7097 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 5e89cba218..f3bfd1db1b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sharkey", - "version": "2024.3.1", + "version": "2024.3.2", "codename": "shonk", "repository": { "type": "git", diff --git a/packages/backend/src/queue/processors/ImportNotesProcessorService.ts b/packages/backend/src/queue/processors/ImportNotesProcessorService.ts index 67e2eb7407..7cef858c51 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); } } |