Merge branch 'stable' into bump-devel-version
This commit is contained in:
commit
e6970a0e7c
@ -11,7 +11,7 @@ testCommit:
|
|||||||
variables:
|
variables:
|
||||||
POSTGRES_PASSWORD: ci
|
POSTGRES_PASSWORD: ci
|
||||||
script:
|
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
|
- cp .config/ci.yml .config/default.yml
|
||||||
- corepack enable
|
- corepack enable
|
||||||
- corepack prepare pnpm@latest --activate
|
- corepack prepare pnpm@latest --activate
|
||||||
@ -55,6 +55,8 @@ getImageTag:
|
|||||||
only:
|
only:
|
||||||
- stable
|
- stable
|
||||||
- develop
|
- develop
|
||||||
|
- tags
|
||||||
|
|
||||||
buildDocker:
|
buildDocker:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
needs:
|
needs:
|
||||||
@ -78,6 +80,8 @@ buildDocker:
|
|||||||
only:
|
only:
|
||||||
- stable
|
- stable
|
||||||
- develop
|
- develop
|
||||||
|
- tags
|
||||||
|
|
||||||
mergeManifests:
|
mergeManifests:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
needs:
|
needs:
|
||||||
@ -103,3 +107,4 @@ mergeManifests:
|
|||||||
only:
|
only:
|
||||||
- stable
|
- stable
|
||||||
- develop
|
- develop
|
||||||
|
- tags
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "sharkey",
|
"name": "sharkey",
|
||||||
"version": "2024.3.1",
|
"version": "2024.3.2",
|
||||||
"codename": "shonk",
|
"codename": "shonk",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
@ -421,7 +421,7 @@ export class ImportNotesProcessorService {
|
|||||||
if (file.name) {
|
if (file.name) {
|
||||||
this.driveService.updateFile(exists, { comment: file.name }, user);
|
this.driveService.updateFile(exists, { comment: file.name }, user);
|
||||||
}
|
}
|
||||||
|
|
||||||
files.push(exists);
|
files.push(exists);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user