From cb12d0c787bbd11ce6107cb8d5a82345b1294be8 Mon Sep 17 00:00:00 2001 From: virgilchiriac Date: Thu, 27 Jun 2024 14:29:54 +0200 Subject: [PATCH 1/6] BC-7461 - update mongo version in CI --- .github/workflows/migrations.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/migrations.yml b/.github/workflows/migrations.yml index 525dd04c94f..45dcacb445e 100644 --- a/.github/workflows/migrations.yml +++ b/.github/workflows/migrations.yml @@ -11,7 +11,7 @@ on: branches: [ main ] env: - MONGODB_VERSION: 5.0 + MONGODB_VERSION: 6.0.15 NODE_VERSION: '18' jobs: migration: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2d759947fea..7a168f69029 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ permissions: contents: read env: - MONGODB_VERSION: 5.0 + MONGODB_VERSION: 6.0.15 NODE_VERSION: '18' jobs: feathers_tests_cov: From b3ef83937c4aab682178e24643720b2fc8e3c174 Mon Sep 17 00:00:00 2001 From: virgilchiriac Date: Mon, 1 Jul 2024 15:08:26 +0200 Subject: [PATCH 2/6] BC-7461 - update mongo version for test setup --- apps/server/test/globalSetup.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/server/test/globalSetup.ts b/apps/server/test/globalSetup.ts index 68b50329bb9..4c398ea94b1 100644 --- a/apps/server/test/globalSetup.ts +++ b/apps/server/test/globalSetup.ts @@ -3,7 +3,7 @@ import { MongoMemoryServer } from 'mongodb-memory-server-global'; export = async function globalSetup() { const instance = await MongoMemoryServer.create({ binary: { - version: '5.0.26', + version: '6.0.15', }, }); const uri = instance.getUri(); From 3d6d328c1f789d8db9157cee5ee67e270e2fcdfc Mon Sep 17 00:00:00 2001 From: virgilchiriac Date: Tue, 2 Jul 2024 08:30:19 +0200 Subject: [PATCH 3/6] tem change branch for testing todo revert this commit --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 32a20eac108..a55e25c09cd 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -189,7 +189,7 @@ jobs: needs: - build_and_push - branch_meta - uses: hpi-schul-cloud/end-to-end-tests/.github/workflows/e2e_call.yml@main + uses: hpi-schul-cloud/end-to-end-tests/.github/workflows/e2e_call.yml@BC-7461-mongo6 with: ref: ${{ needs.branch_meta.outputs.branch }} From 88b0498fbc973baec26e857e4092d29ca2aeb613 Mon Sep 17 00:00:00 2001 From: MartinSchuhmacher Date: Wed, 10 Jul 2024 13:36:29 +0200 Subject: [PATCH 4/6] removing mongo patch version for github workflow --- .github/workflows/migrations.yml | 4 ++-- .github/workflows/test.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/migrations.yml b/.github/workflows/migrations.yml index 45dcacb445e..6ca383f87d0 100644 --- a/.github/workflows/migrations.yml +++ b/.github/workflows/migrations.yml @@ -1,6 +1,6 @@ name: Reminder to update seed data after migration # If this workflow fails, it is a hint that you forgot to update the seed data after a migration. -# It is only a hint, because it only checks if you updated the migration collection in the seed data. +# It is only a hint, because it only checks if you updated the migration collection in the seed data. # It is not a check that you updated the whole seed data correctly. # See the documentation for advice: https://documentation.dbildungscloud.dev/docs/schulcloud-server/Migrations#committing-a-migration @@ -11,7 +11,7 @@ on: branches: [ main ] env: - MONGODB_VERSION: 6.0.15 + MONGODB_VERSION: 6.0 NODE_VERSION: '18' jobs: migration: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7a168f69029..170ef80cd1d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ permissions: contents: read env: - MONGODB_VERSION: 6.0.15 + MONGODB_VERSION: 6.0 NODE_VERSION: '18' jobs: feathers_tests_cov: From 6df9a3b0df2f4fd62e59cae0d7fa1f5682b437e7 Mon Sep 17 00:00:00 2001 From: MartinSchuhmacher Date: Wed, 10 Jul 2024 15:27:31 +0200 Subject: [PATCH 5/6] adjusting used mongo version --- apps/server/test/globalSetup.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/server/test/globalSetup.ts b/apps/server/test/globalSetup.ts index 4c398ea94b1..0928ed73cf9 100644 --- a/apps/server/test/globalSetup.ts +++ b/apps/server/test/globalSetup.ts @@ -3,7 +3,7 @@ import { MongoMemoryServer } from 'mongodb-memory-server-global'; export = async function globalSetup() { const instance = await MongoMemoryServer.create({ binary: { - version: '6.0.15', + version: '6.0.16', }, }); const uri = instance.getUri(); From 607892ceb0e4a81634eebbd29b0535ebebd329d0 Mon Sep 17 00:00:00 2001 From: MartinSchuhmacher Date: Wed, 10 Jul 2024 23:37:43 +0200 Subject: [PATCH 6/6] revert used branch back to main --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index a55e25c09cd..32a20eac108 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -189,7 +189,7 @@ jobs: needs: - build_and_push - branch_meta - uses: hpi-schul-cloud/end-to-end-tests/.github/workflows/e2e_call.yml@BC-7461-mongo6 + uses: hpi-schul-cloud/end-to-end-tests/.github/workflows/e2e_call.yml@main with: ref: ${{ needs.branch_meta.outputs.branch }}