From 7472972939efd416ffc36cc72adab28de6f0cbdf Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Wed, 26 Jun 2024 21:48:04 +0100
Subject: [PATCH 1/2] prepare for the next release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2ff23d3a74..519a8c453d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sharkey",
-	"version": "2024.5.0",
+	"version": "2024.6.0-dev",
 	"codename": "shonk",
 	"repository": {
 		"type": "git",

From 04e5f16e2a400ff8fc895677e4b3c201fa34a30b Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Wed, 26 Jun 2024 21:55:08 +0100
Subject: [PATCH 2/2] run tests in series

this _might_ reduce the change of the tests failing in our CI
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84d29851b2..2e773eddf9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ testCommit:
     - pnpm install --frozen-lockfile
     - pnpm run build
     - pnpm run migrate
-    - pnpm run --filter='!megalodon' test
+    - pnpm run --filter='!megalodon' --workspace-concurrency=1 test
     - pnpm run --filter=backend lint
     - pnpm run --filter=frontend eslint
   cache: