Merge branch 'stable' into bump-devel-version

This commit is contained in:
dakkar 2024-03-30 12:44:31 +00:00
commit e6970a0e7c
3 changed files with 8 additions and 3 deletions

View file

@ -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

View file

@ -1,6 +1,6 @@
{
"name": "sharkey",
"version": "2024.3.1",
"version": "2024.3.2",
"codename": "shonk",
"repository": {
"type": "git",

View file

@ -421,7 +421,7 @@ export class ImportNotesProcessorService {
if (file.name) {
this.driveService.updateFile(exists, { comment: file.name }, user);
}
files.push(exists);
}
}