Skip to content
Snippets Groups Projects
Commit 011ccd3a authored by Marie's avatar Marie
Browse files

merge: bump `devel` version (!486)

View MR for information: Sharkey!486



Approved-by: default avatarMarie <marie@kaifa.ch>
Approved-by: default avatarAmelia Yukii <amelia.yukii@shourai.de>
parents 28065fc1 2a634e03
No related branches found
No related tags found
2 merge requests!501Release 2024.3.3,!486bump `devel` version
Pipeline #492 passed with stages
in 15 minutes and 1 second
......@@ -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
{
"name": "sharkey",
"version": "2024.3.1",
"version": "2024.3.2-devel",
"codename": "shonk",
"repository": {
"type": "git",
......
......@@ -421,7 +421,7 @@ export class ImportNotesProcessorService {
if (file.name) {
this.driveService.updateFile(exists, { comment: file.name }, user);
}
files.push(exists);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment