From 143c37c1c47c8a9af4b8c4d480e9a6bcf242bb03 Mon Sep 17 00:00:00 2001 From: Magnus Schieder <50337967+m-schieder@users.noreply.github.com> Date: Mon, 5 May 2025 15:03:04 +0200 Subject: [PATCH 01/49] Updated services (#6907) Co-authored-by: Magnus Schieder --- VERSION | 2 +- openslides-client | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 166f28a9bd..069f0992a2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.2.8-dev +4.2.9-dev diff --git a/openslides-client b/openslides-client index b21b67da1f..e4d35321a0 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit b21b67da1ffede56e736d85cce23762338de37b3 +Subproject commit e4d35321a06580c87dc4af43bff2db25ca374901 From 9b0cd2774a9270de5a75a1ec6fa8252a7d131ad0 Mon Sep 17 00:00:00 2001 From: rrenkert Date: Mon, 5 May 2025 16:33:12 +0200 Subject: [PATCH 02/49] Create patchnotes for 4.2.9 (#6908) --- patchnotes/4.2.9.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 patchnotes/4.2.9.md diff --git a/patchnotes/4.2.9.md b/patchnotes/4.2.9.md new file mode 100644 index 0000000000..cb1566c68f --- /dev/null +++ b/patchnotes/4.2.9.md @@ -0,0 +1,10 @@ +## Patchnotes 4.2.9 + +### New Features + +### Optimizations +- PDF export: PDF files are exported in the PDF/A-3a standard + +### Bug Fixes +- Motions > Change recommendations: Editing of change recommendations with changed line numbering was not possible +- Motions > Forwarding: Fixed a bug where newly created change recommendations were not visible in forwarded motions. From 706b044f4e79259d1a4b4751a5362fb2ad17dc96 Mon Sep 17 00:00:00 2001 From: Magnus Schieder <50337967+m-schieder@users.noreply.github.com> Date: Wed, 7 May 2025 15:35:22 +0200 Subject: [PATCH 03/49] Updated services (#6911) --- VERSION | 2 +- openslides-client | 2 +- openslides-search-service | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 069f0992a2..c7457e92b1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.2.9-dev +4.2.10-dev diff --git a/openslides-client b/openslides-client index e4d35321a0..78a412a767 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit e4d35321a06580c87dc4af43bff2db25ca374901 +Subproject commit 78a412a767717b082b6d3f81bcff6657e8930b53 diff --git a/openslides-search-service b/openslides-search-service index 1163530800..ad9bf422ed 160000 --- a/openslides-search-service +++ b/openslides-search-service @@ -1 +1 @@ -Subproject commit 116353080042b91d0d95b17f690e2f1f80e57b61 +Subproject commit ad9bf422ed9bbfbf8e2ab8b80f6fe703d56dccd8 From 51754c14ec2cf37147ddc38505df987dae1d0311 Mon Sep 17 00:00:00 2001 From: rrenkert Date: Wed, 7 May 2025 17:34:27 +0200 Subject: [PATCH 04/49] Create patchnotes for 4.2.10 (#6913) --- patchnotes/4.2.10.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 patchnotes/4.2.10.md diff --git a/patchnotes/4.2.10.md b/patchnotes/4.2.10.md new file mode 100644 index 0000000000..4f00904571 --- /dev/null +++ b/patchnotes/4.2.10.md @@ -0,0 +1,9 @@ +## Patchnotes 4.2.10 + +### Optimizations +- Dialogs: Closing/canceling all dialogs is now possible with ESC. +- eVoting > Result display: Comma or point is used as decimal separator for results depending on the meeting language. + +### Bug fixes +- Motions > Export: Fixed a bug where the sorting was done by IDs and not by the displayed sorting when exporting via multiselect. +- eVoting > Progress bar in autopilot: Progress bar was not visible in autopilot. From ecde8fa9db8b4ca2d17b729e565dde4140107711 Mon Sep 17 00:00:00 2001 From: Magnus Schieder <50337967+m-schieder@users.noreply.github.com> Date: Mon, 12 May 2025 17:19:01 +0200 Subject: [PATCH 05/49] Updated services (#6915) --- VERSION | 2 +- lib/openslides-go | 2 +- openslides-autoupdate-service | 2 +- openslides-icc-service | 2 +- openslides-search-service | 2 +- openslides-vote-service | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index c7457e92b1..bfa6f6a91f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.2.10-dev +4.2.11-dev diff --git a/lib/openslides-go b/lib/openslides-go index 8aac50248e..03468a35b4 160000 --- a/lib/openslides-go +++ b/lib/openslides-go @@ -1 +1 @@ -Subproject commit 8aac50248ebfa6bdd37d25590d87f6095adfb012 +Subproject commit 03468a35b41c21dc0ad0d0b54035e1a43e189d2d diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service index 6e33603ab9..7575e34f53 160000 --- a/openslides-autoupdate-service +++ b/openslides-autoupdate-service @@ -1 +1 @@ -Subproject commit 6e33603ab9f69d56cbfec57ca5a40f693c729bf7 +Subproject commit 7575e34f53f9f57caa6eda4a388f7ae67ee8cecd diff --git a/openslides-icc-service b/openslides-icc-service index 52efdd8788..b5c9013a6a 160000 --- a/openslides-icc-service +++ b/openslides-icc-service @@ -1 +1 @@ -Subproject commit 52efdd878869a4f3bcf26a478515187297459486 +Subproject commit b5c9013a6a58e0b3574f5571f4831ba866c72f06 diff --git a/openslides-search-service b/openslides-search-service index ad9bf422ed..3e098bce51 160000 --- a/openslides-search-service +++ b/openslides-search-service @@ -1 +1 @@ -Subproject commit ad9bf422ed9bbfbf8e2ab8b80f6fe703d56dccd8 +Subproject commit 3e098bce51c8610615f30730633bef8375aaa669 diff --git a/openslides-vote-service b/openslides-vote-service index e578a2ce98..949e649cd9 160000 --- a/openslides-vote-service +++ b/openslides-vote-service @@ -1 +1 @@ -Subproject commit e578a2ce987b2d136c5cbfa193c65d5a7931deeb +Subproject commit 949e649cd9db744634bb1c4bb75269f0163849b3 From f6c55643d9c6b7063440717cc4e656c8189c1e1c Mon Sep 17 00:00:00 2001 From: rrenkert Date: Mon, 12 May 2025 17:44:42 +0200 Subject: [PATCH 06/49] Create patchnotes for 4.2.11 (#6916) --- patchnotes/4.2.11.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 patchnotes/4.2.11.md diff --git a/patchnotes/4.2.11.md b/patchnotes/4.2.11.md new file mode 100644 index 0000000000..8b781f1a7c --- /dev/null +++ b/patchnotes/4.2.11.md @@ -0,0 +1,4 @@ +## Patchnotes 4.2.11 + +### Bug Fixes +- eVoting: The progress bar shows reliable data. From cb77d4451b914e023ea7b26699199dfe1308626b Mon Sep 17 00:00:00 2001 From: Magnus Schieder <50337967+m-schieder@users.noreply.github.com> Date: Wed, 14 May 2025 15:52:35 +0200 Subject: [PATCH 07/49] Updated services (#6919) --- VERSION | 2 +- openslides-auth-service | 2 +- openslides-backend | 2 +- openslides-client | 2 +- openslides-datastore-service | 2 +- openslides-vote-service | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index bfa6f6a91f..adf9931296 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.2.11-dev +4.2.12-dev diff --git a/openslides-auth-service b/openslides-auth-service index fca6afbf6a..acc153e8b8 160000 --- a/openslides-auth-service +++ b/openslides-auth-service @@ -1 +1 @@ -Subproject commit fca6afbf6ad5c6f139749cd92e61903bce8b3c26 +Subproject commit acc153e8b824284a565519cc33f6704d70c532cc diff --git a/openslides-backend b/openslides-backend index 763d29589e..f6f2a35c8d 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit 763d29589e85a9f34ffa81bdca42367547efc763 +Subproject commit f6f2a35c8d491dd856cc7dd2974fa7764747f9c6 diff --git a/openslides-client b/openslides-client index 78a412a767..d862f9d8d3 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit 78a412a767717b082b6d3f81bcff6657e8930b53 +Subproject commit d862f9d8d37c993084c482a15d7232af510c9071 diff --git a/openslides-datastore-service b/openslides-datastore-service index 9b2ab5ebdf..fe1a610a5d 160000 --- a/openslides-datastore-service +++ b/openslides-datastore-service @@ -1 +1 @@ -Subproject commit 9b2ab5ebdff1e012507225e83ea690471e4bb03a +Subproject commit fe1a610a5d07b61d72dd69a4dcdc014643f6ac19 diff --git a/openslides-vote-service b/openslides-vote-service index 949e649cd9..3b2850ea39 160000 --- a/openslides-vote-service +++ b/openslides-vote-service @@ -1 +1 @@ -Subproject commit 949e649cd9db744634bb1c4bb75269f0163849b3 +Subproject commit 3b2850ea39fa8a8122b9f5b3d812720355379fdc From 748010f3e7d80d3e2277beb30caa59ecd2a270c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Thu, 15 May 2025 11:23:01 +0200 Subject: [PATCH 08/49] Updated translations (#6920) --- i18n/de.po | 17 ++++++++++------- i18n/template-en.pot | 15 +++++++++------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/i18n/de.po b/i18n/de.po index 0219e91a75..e2910adc59 100644 --- a/i18n/de.po +++ b/i18n/de.po @@ -112,9 +112,6 @@ msgstr "Annehmen" msgid "Access data (PDF)" msgstr "Zugangsdaten (PDF)" -msgid "Access groups" -msgstr "Zugriffsgruppen" - msgid "" "Access only possible for participants of this meeting. All other accounts " "(including organization and committee admins) may not open the closed " @@ -1726,15 +1723,15 @@ msgid "Default visibility for new agenda items (except topics)" msgstr "" "Voreingestellte Sichtbarkeit für neue Tagesordnungspunkte (außer Themen)" -msgid "Default vote method" -msgstr "Voreingestellte Abstimmungsmethode" - msgid "Default vote weight" msgstr "Standard-Stimmgewicht" msgid "Default voting duration" msgstr "Voreingestellte Dauer der Stimmabgabe" +msgid "Default voting method" +msgstr "Voreingestellte Abstimmungsmethode" + msgid "Default voting type" msgstr "Voreingestellte Art der Stimmabgabe" @@ -2023,6 +2020,9 @@ msgstr "Wahl" msgid "Election documents" msgstr "Wahlunterlagen" +msgid "Election method" +msgstr "Wahlmethode" + msgid "Elections" msgstr "Wahlen" @@ -2657,6 +2657,9 @@ msgstr "Bezeichner" msgid "If deactivated it is displayed below the title." msgstr "Wenn deaktiviert erfolgt die Anzeige unterhalb des Antragstitels." +msgid "If empty, everyone can access." +msgstr "Voller Zugriff, wenn keine Gruppe eingetragen." + msgid "" "If it is an amendment, you can back up its content when editing it and " "delete it afterwards." @@ -5577,7 +5580,7 @@ msgid "Voting is currently in progress." msgstr "Stimmabgabe läuft aktuell " msgid "Voting method" -msgstr "Wahlmethode" +msgstr "Abstimmungsmethode" msgid "Voting opened" msgstr "Abstimmung eröffnet" diff --git a/i18n/template-en.pot b/i18n/template-en.pot index e8ee5b0661..18f3c14d05 100644 --- a/i18n/template-en.pot +++ b/i18n/template-en.pot @@ -88,9 +88,6 @@ msgstr "" msgid "Access data (PDF)" msgstr "" -msgid "Access groups" -msgstr "" - msgid "" "Access only possible for participants of this meeting. All other accounts " "(including organization and committee admins) may not open the closed " @@ -1571,15 +1568,15 @@ msgstr "" msgid "Default visibility for new agenda items (except topics)" msgstr "" -msgid "Default vote method" -msgstr "" - msgid "Default vote weight" msgstr "" msgid "Default voting duration" msgstr "" +msgid "Default voting method" +msgstr "" + msgid "Default voting type" msgstr "" @@ -1841,6 +1838,9 @@ msgstr "" msgid "Election documents" msgstr "" +msgid "Election method" +msgstr "" + msgid "Elections" msgstr "" @@ -2431,6 +2431,9 @@ msgstr "" msgid "If deactivated it is displayed below the title." msgstr "" +msgid "If empty, everyone can access." +msgstr "" + msgid "" "If it is an amendment, you can back up its content when editing it and " "delete it afterwards." From 0322c191db4a01648007bbbb33dc05dabef5bf10 Mon Sep 17 00:00:00 2001 From: rrenkert Date: Thu, 15 May 2025 15:38:07 +0200 Subject: [PATCH 09/49] Create patchnotes for 4.2.12 (#6923) --- patchnotes/4.2.12.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 patchnotes/4.2.12.md diff --git a/patchnotes/4.2.12.md b/patchnotes/4.2.12.md new file mode 100644 index 0000000000..02c4386cda --- /dev/null +++ b/patchnotes/4.2.12.md @@ -0,0 +1,8 @@ +## Patchnotes 4.2.12 + +### Optimizations +- Motions > detail view > Forwarding buttons: The ‘Forward’ button is hidden in the application if forwarding is no longer possible. Note: The button in the three-dot menu is only hidden after the motion detail page has been reloaded. This will be revised in an upcoming version. +- Motions > Detail view: Layout of the editor in editorial final version improved +- Layout of drop-down menus improved +- eVoting: linguistic clarifications for voting and voting method selection menus integrated +- Translations added From 13df241d5ba38524713f483ddcf5f098d1db9bbf Mon Sep 17 00:00:00 2001 From: rrenkert Date: Fri, 16 May 2025 09:58:43 +0200 Subject: [PATCH 10/49] Remove milestone from pick-to-staging.yml (#6922) --- .github/workflows/pick-to-staging.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pick-to-staging.yml b/.github/workflows/pick-to-staging.yml index 7191ed4d14..5cdab2b51f 100644 --- a/.github/workflows/pick-to-staging.yml +++ b/.github/workflows/pick-to-staging.yml @@ -63,4 +63,3 @@ jobs: reviewers: ${{ github.event.pull_request.user.login }} assignees: ${{ github.event.pull_request.user.login }} labels: picked-to-staging - milestone: 4 From 60b79e7e6c3c6f12176126577f37d46885d180e4 Mon Sep 17 00:00:00 2001 From: rrenkert Date: Fri, 23 May 2025 12:42:06 +0200 Subject: [PATCH 11/49] Create patchnotes for 4.2.13 (#6925) --- patchnotes/4.2.13.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 patchnotes/4.2.13.md diff --git a/patchnotes/4.2.13.md b/patchnotes/4.2.13.md new file mode 100644 index 0000000000..ea2aaba5e2 --- /dev/null +++ b/patchnotes/4.2.13.md @@ -0,0 +1,3 @@ +## Patchnotes 4.2.13 + +Fix merge artifacts in last stable updates From d89f7ceedc3099724b43170996039598b6a05915 Mon Sep 17 00:00:00 2001 From: Loki Elble <69210919+Elblinator@users.noreply.github.com> Date: Wed, 4 Jun 2025 16:19:33 +0200 Subject: [PATCH 12/49] Updated services (#6928) --- VERSION | 2 +- lib/openslides-go | 2 +- openslides-auth-service | 2 +- openslides-autoupdate-service | 2 +- openslides-backend | 2 +- openslides-client | 2 +- openslides-datastore-service | 2 +- openslides-icc-service | 2 +- openslides-media-service | 2 +- openslides-search-service | 2 +- openslides-vote-service | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/VERSION b/VERSION index adf9931296..1a42702561 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.2.12-dev +4.2.14-dev diff --git a/lib/openslides-go b/lib/openslides-go index 03468a35b4..e9269a9aa4 160000 --- a/lib/openslides-go +++ b/lib/openslides-go @@ -1 +1 @@ -Subproject commit 03468a35b41c21dc0ad0d0b54035e1a43e189d2d +Subproject commit e9269a9aa4d7aae0da8aa4c11f6c9b76abc50b6c diff --git a/openslides-auth-service b/openslides-auth-service index acc153e8b8..4624f12e51 160000 --- a/openslides-auth-service +++ b/openslides-auth-service @@ -1 +1 @@ -Subproject commit acc153e8b824284a565519cc33f6704d70c532cc +Subproject commit 4624f12e518a966205d4d4244daaf8cadabf56e2 diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service index 7575e34f53..e2631170b6 160000 --- a/openslides-autoupdate-service +++ b/openslides-autoupdate-service @@ -1 +1 @@ -Subproject commit 7575e34f53f9f57caa6eda4a388f7ae67ee8cecd +Subproject commit e2631170b69d2da11d5ab8c11c8a6db8c3840975 diff --git a/openslides-backend b/openslides-backend index f6f2a35c8d..8fe81dec38 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit f6f2a35c8d491dd856cc7dd2974fa7764747f9c6 +Subproject commit 8fe81dec38ba6986d9e585ad2a7c61e181ce8fbc diff --git a/openslides-client b/openslides-client index d862f9d8d3..79007ffd64 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit d862f9d8d37c993084c482a15d7232af510c9071 +Subproject commit 79007ffd641e1eeed8680e6c1b748c4033745be0 diff --git a/openslides-datastore-service b/openslides-datastore-service index fe1a610a5d..97defd1c9e 160000 --- a/openslides-datastore-service +++ b/openslides-datastore-service @@ -1 +1 @@ -Subproject commit fe1a610a5d07b61d72dd69a4dcdc014643f6ac19 +Subproject commit 97defd1c9ede6d0a42a20785c898d1282a15f341 diff --git a/openslides-icc-service b/openslides-icc-service index b5c9013a6a..7c0ced55d4 160000 --- a/openslides-icc-service +++ b/openslides-icc-service @@ -1 +1 @@ -Subproject commit b5c9013a6a58e0b3574f5571f4831ba866c72f06 +Subproject commit 7c0ced55d4bb4c829a807ad86981a81d6377e2e7 diff --git a/openslides-media-service b/openslides-media-service index 00b15d0270..f7d647ae79 160000 --- a/openslides-media-service +++ b/openslides-media-service @@ -1 +1 @@ -Subproject commit 00b15d0270a24e080c34d112f578814b2c00e4ba +Subproject commit f7d647ae79ba7e29d69326051711a95b98fcda89 diff --git a/openslides-search-service b/openslides-search-service index 3e098bce51..8b3adc6c49 160000 --- a/openslides-search-service +++ b/openslides-search-service @@ -1 +1 @@ -Subproject commit 3e098bce51c8610615f30730633bef8375aaa669 +Subproject commit 8b3adc6c4955574e5fbac9faebb7a20958d09a98 diff --git a/openslides-vote-service b/openslides-vote-service index 3b2850ea39..78d0f6ec79 160000 --- a/openslides-vote-service +++ b/openslides-vote-service @@ -1 +1 @@ -Subproject commit 3b2850ea39fa8a8122b9f5b3d812720355379fdc +Subproject commit 78d0f6ec79615a4b9489b97f07389b8ff3269f92 From 7bfe81a08294ed6c78de8e0278730aa54c83b905 Mon Sep 17 00:00:00 2001 From: Loki Elble Date: Wed, 4 Jun 2025 16:21:52 +0200 Subject: [PATCH 13/49] Staging update 20250604 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1a42702561..c0b0f22a1f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.2.14-dev +4.2.14 From fcd3bb4130a968c408a6a8304a3c8db1c293fa2b Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Thu, 5 Jun 2025 16:03:03 +0200 Subject: [PATCH 14/49] Almost works? --- dev/actions/build-service/action-run.sh | 2 -- openslides-auth-service | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dev/actions/build-service/action-run.sh b/dev/actions/build-service/action-run.sh index db86c9390d..acbc8a84bd 100644 --- a/dev/actions/build-service/action-run.sh +++ b/dev/actions/build-service/action-run.sh @@ -1,6 +1,4 @@ #!/bin/bash -printenv - chmod +x ${GITHUB_ACTION_PATH}/../../scripts/makefile/build-service.sh ${GITHUB_ACTION_PATH}/../../scripts/makefile/build-service.sh ${SERVICE} ${CONTEXT} ${MODULE} ${PORT} \ No newline at end of file diff --git a/openslides-auth-service b/openslides-auth-service index afb7498a3d..dba9c2b7b7 160000 --- a/openslides-auth-service +++ b/openslides-auth-service @@ -1 +1 @@ -Subproject commit afb7498a3d305108b9707acdc21bd365ebfb9414 +Subproject commit dba9c2b7b750d04d042d0dcf233a865ac24b9bd6 From f51192399be4da69354e2ba7676b3cfcf3181ae6 Mon Sep 17 00:00:00 2001 From: Loki Elble Date: Thu, 5 Jun 2025 16:20:12 +0200 Subject: [PATCH 15/49] Staging update 20250605 --- openslides-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openslides-client b/openslides-client index 79007ffd64..b039297635 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit 79007ffd641e1eeed8680e6c1b748c4033745be0 +Subproject commit b039297635984a4b753e3009a95777de41bd547a From 4174d59a2a10d4faabd4aaf6cbb8e8980e22fe9e Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Thu, 5 Jun 2025 16:47:31 +0200 Subject: [PATCH 16/49] Build and Test Action --- .github/workflows/debug-workflow.yml | 2 +- .../build-and-test-service/action-run.sh | 4 ++++ dev/actions/build-and-test-service/action.yml | 19 +++++++++++++++++++ dev/actions/test-submodule/action-run.sh | 5 ----- dev/actions/test-submodule/action.yml | 9 --------- openslides-auth-service | 2 +- 6 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 dev/actions/build-and-test-service/action-run.sh create mode 100644 dev/actions/build-and-test-service/action.yml delete mode 100644 dev/actions/test-submodule/action-run.sh delete mode 100644 dev/actions/test-submodule/action.yml diff --git a/.github/workflows/debug-workflow.yml b/.github/workflows/debug-workflow.yml index 949b0c8673..c83c3b07d2 100644 --- a/.github/workflows/debug-workflow.yml +++ b/.github/workflows/debug-workflow.yml @@ -9,4 +9,4 @@ jobs: - name: Test run: echo "Hey" - name: Test actions - uses: Janmtbehrens/OpenSlides/dev/actions/test-submodule@main \ No newline at end of file + uses: Janmtbehrens/OpenSlides/dev/actions/build-and-test-service@main \ No newline at end of file diff --git a/dev/actions/build-and-test-service/action-run.sh b/dev/actions/build-and-test-service/action-run.sh new file mode 100644 index 0000000000..6dc7f9e95c --- /dev/null +++ b/dev/actions/build-and-test-service/action-run.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +bash dev/run-tests + diff --git a/dev/actions/build-and-test-service/action.yml b/dev/actions/build-and-test-service/action.yml new file mode 100644 index 0000000000..c4f990437a --- /dev/null +++ b/dev/actions/build-and-test-service/action.yml @@ -0,0 +1,19 @@ +name: 'Build and run service tests' +description: 'Build test context image and runs all tests of service.' + +inputs: + service: + description: 'Name of the service. Examples: proxy, auth, datastore' + required: true + +runs: + using: "composite" + steps: + - name: "Build Test" + uses: Janmtbehrens/OpenSlides/dev/actions/build-module@main + with: + service: ${{ inputs.service }} + context: tests + - name: "Test Service" + shell: bash + run: bash $GITHUB_ACTION_PATH/action-run.sh diff --git a/dev/actions/test-submodule/action-run.sh b/dev/actions/test-submodule/action-run.sh deleted file mode 100644 index 4997771322..0000000000 --- a/dev/actions/test-submodule/action-run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -echo "I know my path" -echo $GITHUB_ACTION_PATH - diff --git a/dev/actions/test-submodule/action.yml b/dev/actions/test-submodule/action.yml deleted file mode 100644 index b0f635d39d..0000000000 --- a/dev/actions/test-submodule/action.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: 'Run submodule tests' -description: 'Runs make run-test and supplies all necessary files.' - -runs: - using: "composite" - steps: - - name: "Test Build" - shell: bash - run: bash $GITHUB_ACTION_PATH/action-run.sh diff --git a/openslides-auth-service b/openslides-auth-service index dba9c2b7b7..6edb0bd4f5 160000 --- a/openslides-auth-service +++ b/openslides-auth-service @@ -1 +1 @@ -Subproject commit dba9c2b7b750d04d042d0dcf233a865ac24b9bd6 +Subproject commit 6edb0bd4f59284b234519ed0a5420c587bbdaafd From 50ff8cfdbcc10f1e2529b44fa10c6a6732dad318 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Thu, 5 Jun 2025 16:48:12 +0200 Subject: [PATCH 17/49] Test --- .github/workflows/debug-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/debug-workflow.yml b/.github/workflows/debug-workflow.yml index c83c3b07d2..908abff739 100644 --- a/.github/workflows/debug-workflow.yml +++ b/.github/workflows/debug-workflow.yml @@ -9,4 +9,4 @@ jobs: - name: Test run: echo "Hey" - name: Test actions - uses: Janmtbehrens/OpenSlides/dev/actions/build-and-test-service@main \ No newline at end of file + uses: Janmtbehrens/OpenSlides/dev/actions/build-and-test-service@all-in-one \ No newline at end of file From 439b078bead5de02a57327a17f66ce5b9a0eea9f Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Thu, 5 Jun 2025 16:49:59 +0200 Subject: [PATCH 18/49] Test #2 --- dev/actions/build-and-test-service/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/actions/build-and-test-service/action.yml b/dev/actions/build-and-test-service/action.yml index c4f990437a..7f7ecd7e0f 100644 --- a/dev/actions/build-and-test-service/action.yml +++ b/dev/actions/build-and-test-service/action.yml @@ -10,7 +10,7 @@ runs: using: "composite" steps: - name: "Build Test" - uses: Janmtbehrens/OpenSlides/dev/actions/build-module@main + uses: Janmtbehrens/OpenSlides/dev/actions/build-module@all-in-one with: service: ${{ inputs.service }} context: tests From f615418e79b2cc9181cd3b533a109e2146e94a48 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Thu, 5 Jun 2025 16:50:39 +0200 Subject: [PATCH 19/49] Test #3 --- dev/actions/build-and-test-service/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/actions/build-and-test-service/action.yml b/dev/actions/build-and-test-service/action.yml index 7f7ecd7e0f..d57cebe190 100644 --- a/dev/actions/build-and-test-service/action.yml +++ b/dev/actions/build-and-test-service/action.yml @@ -10,7 +10,7 @@ runs: using: "composite" steps: - name: "Build Test" - uses: Janmtbehrens/OpenSlides/dev/actions/build-module@all-in-one + uses: Janmtbehrens/OpenSlides/dev/actions/build-service@all-in-one with: service: ${{ inputs.service }} context: tests From 82c291083c1aae5e6a29a6d268376b4cca818293 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Thu, 5 Jun 2025 16:53:52 +0200 Subject: [PATCH 20/49] Auth Test --- .github/workflows/debug-workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/debug-workflow.yml b/.github/workflows/debug-workflow.yml index 908abff739..c417876d5d 100644 --- a/.github/workflows/debug-workflow.yml +++ b/.github/workflows/debug-workflow.yml @@ -6,7 +6,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Test - run: echo "Hey" - name: Test actions - uses: Janmtbehrens/OpenSlides/dev/actions/build-and-test-service@all-in-one \ No newline at end of file + uses: Janmtbehrens/OpenSlides/dev/actions/build-and-test-service@all-in-one + with: + service: auth \ No newline at end of file From 64dbfac73b65fde0b667e8743ee46d9b92634da5 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Tue, 10 Jun 2025 09:26:39 +0200 Subject: [PATCH 21/49] Merged all Submodules --- .github/workflows/debug-workflow.yml | 2 +- dev/scripts/git-fetch-and-merge-upstream.sh | 40 +++++++++++++++++++++ openslides-autoupdate-service | 2 +- openslides-backend | 2 +- openslides-client | 2 +- openslides-datastore-service | 2 +- openslides-icc-service | 2 +- openslides-media-service | 2 +- openslides-search-service | 2 +- openslides-vote-service | 2 +- 10 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 dev/scripts/git-fetch-and-merge-upstream.sh diff --git a/.github/workflows/debug-workflow.yml b/.github/workflows/debug-workflow.yml index c417876d5d..63d61530a8 100644 --- a/.github/workflows/debug-workflow.yml +++ b/.github/workflows/debug-workflow.yml @@ -1,4 +1,4 @@ -on: push +on: deployment jobs: test-job: diff --git a/dev/scripts/git-fetch-and-merge-upstream.sh b/dev/scripts/git-fetch-and-merge-upstream.sh new file mode 100644 index 0000000000..7e6dd70fa8 --- /dev/null +++ b/dev/scripts/git-fetch-and-merge-upstream.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +# Import OpenSlides utils package +. $( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/util.sh + +# Commits and pushes all submodules to their respective repositories. +# The same Commit Message is reused for all Commits +# Use this for blanket changes to all submodules that are the same between all submodules, such as +# Dockerfile changes that need to be applied to all submodules + +export OVERWRITE_MESSAGE=$1 +export MESSAGE="Merge Upstream" +if [ ! -z "${OVERWRITE_MESSAGE}" ]; then + export MESSAGE=$OVERWRITE_MESSAGE +fi + +export SINGLE_TARGET=$2 + +IFS=$'\n' +for DIR in $(git submodule foreach --recursive -q sh -c pwd); do + # Extract submodule name + cd "$DIR" && \ + export DIRNAME=${PWD##*/} && \ + export SUBMODULE=${DIRNAME//"openslides-"} && \ + + if [ $SUBMODULE == 'go' ]; then continue; fi && \ + if [ $SUBMODULE == 'meta' ]; then continue; fi && \ + + # Check for single target + if [ $# -eq 2 ]; then if [[ $SINGLE_TARGET != $SUBMODULE ]]; then continue; fi; fi && \ + + # Git commit + info "Fetch & merge for ${SUBMODULE} " && \ + git fetch upstream && \ + export error=0 && \ + git merge upstream/main || export error=1 && \ + if [ $error -eq 1 ]; then (git commit && git push) ; fi && \ + if [ $error -eq 0 ]; then (git push) ; fi +done +wait \ No newline at end of file diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service index 94135bf182..2e8b2bd228 160000 --- a/openslides-autoupdate-service +++ b/openslides-autoupdate-service @@ -1 +1 @@ -Subproject commit 94135bf1821b6de8d4c2541e3701394c10045c97 +Subproject commit 2e8b2bd228898d98e2a3b4acfe9c7a4001dc3190 diff --git a/openslides-backend b/openslides-backend index 866b89378f..212a72cb1f 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit 866b89378f052eeef84db58f371a7f31c513d61c +Subproject commit 212a72cb1f6aaa2a50c7276ba155b3e7856ab404 diff --git a/openslides-client b/openslides-client index 61ce4217f5..62ecfe2a84 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit 61ce4217f5351e1451e464ebc3a417dd94703d05 +Subproject commit 62ecfe2a8463be449dac2f02b1b1653f6afaa1a1 diff --git a/openslides-datastore-service b/openslides-datastore-service index 749429e1cd..868ac74f42 160000 --- a/openslides-datastore-service +++ b/openslides-datastore-service @@ -1 +1 @@ -Subproject commit 749429e1cd742c7884e5f56d88704274a9f83332 +Subproject commit 868ac74f42aac45a91dcc213532f9c55ba2a7fee diff --git a/openslides-icc-service b/openslides-icc-service index 0b9c6d5b13..5fea936866 160000 --- a/openslides-icc-service +++ b/openslides-icc-service @@ -1 +1 @@ -Subproject commit 0b9c6d5b13286d81f2c19a5802259be981bd3a21 +Subproject commit 5fea9368668523ea210b2389dc40a9e1a44b3d16 diff --git a/openslides-media-service b/openslides-media-service index 296057104e..64ef196578 160000 --- a/openslides-media-service +++ b/openslides-media-service @@ -1 +1 @@ -Subproject commit 296057104e1892d87f4cdb5d5478eacd721f745f +Subproject commit 64ef196578caaadd2aba3f6490ef9df92a736b11 diff --git a/openslides-search-service b/openslides-search-service index 35dbc4cd9a..e321d2a8a9 160000 --- a/openslides-search-service +++ b/openslides-search-service @@ -1 +1 @@ -Subproject commit 35dbc4cd9aa21608ffd97f4fb20b01e07f270b3f +Subproject commit e321d2a8a919152020077dbf1c631352d12f868a diff --git a/openslides-vote-service b/openslides-vote-service index 448d52a24f..2ae3dc9ba8 160000 --- a/openslides-vote-service +++ b/openslides-vote-service @@ -1 +1 @@ -Subproject commit 448d52a24f6d34958cd26ece11e544dce1d7bbc9 +Subproject commit 2ae3dc9ba8f8ae6e20a8faa95ab36d0f8bf2f403 From cc1117ceaa5afb4bf0b39fd46bca6d6f9cfd38d8 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Tue, 10 Jun 2025 15:29:09 +0200 Subject: [PATCH 22/49] Fixed production image names and various bugs --- Makefile | 2 +- dev/scripts/git-fetch-and-merge-upstream.sh | 13 ++----------- dev/scripts/makefile/build-all-submodules.sh | 2 +- dev/scripts/makefile/build-service.sh | 6 +++--- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 256729a55f..5540dd9c6d 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ run-dev-otel: | build-dev build-dev: sed -i "1s/.*/$(GO_VERSION)/" $(DOCKER_PATH)/workspaces/*.work chmod +x $(SCRIPT_PATH)/makefile/build-all-submodules.sh - $(SCRIPT_PATH)/makefile/build-all-submodules.sh + $(SCRIPT_PATH)/makefile/build-all-submodules.sh dev # Run the tests of all services run-service-tests: diff --git a/dev/scripts/git-fetch-and-merge-upstream.sh b/dev/scripts/git-fetch-and-merge-upstream.sh index 7e6dd70fa8..bf2fed9f04 100644 --- a/dev/scripts/git-fetch-and-merge-upstream.sh +++ b/dev/scripts/git-fetch-and-merge-upstream.sh @@ -3,18 +3,9 @@ # Import OpenSlides utils package . $( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/util.sh -# Commits and pushes all submodules to their respective repositories. -# The same Commit Message is reused for all Commits -# Use this for blanket changes to all submodules that are the same between all submodules, such as -# Dockerfile changes that need to be applied to all submodules +# Fetches and merges all submodules with their respective upstream/main repositories. -export OVERWRITE_MESSAGE=$1 -export MESSAGE="Merge Upstream" -if [ ! -z "${OVERWRITE_MESSAGE}" ]; then - export MESSAGE=$OVERWRITE_MESSAGE -fi - -export SINGLE_TARGET=$2 +export SINGLE_TARGET=$1 IFS=$'\n' for DIR in $(git submodule foreach --recursive -q sh -c pwd); do diff --git a/dev/scripts/makefile/build-all-submodules.sh b/dev/scripts/makefile/build-all-submodules.sh index d1aeb94b88..eba144e9cd 100755 --- a/dev/scripts/makefile/build-all-submodules.sh +++ b/dev/scripts/makefile/build-all-submodules.sh @@ -32,6 +32,6 @@ for DIR in $(git submodule foreach --recursive -q sh -c pwd); do # Execute test info " --- Building service ${SUBMODULE} for context ${CONTEXT} --- " && \ - echocmd eval "make build-dev" + echocmd eval "make build-${CONTEXT}" done wait \ No newline at end of file diff --git a/dev/scripts/makefile/build-service.sh b/dev/scripts/makefile/build-service.sh index cb288d1718..da190dfccc 100644 --- a/dev/scripts/makefile/build-service.sh +++ b/dev/scripts/makefile/build-service.sh @@ -20,15 +20,15 @@ if [ "${CONTEXT}" != "prod" -a "${CONTEXT}" != "dev" -a "${CONTEXT}" != "tests" exit 1; \ fi -export TAG=openslides-${SERVICE}- +export TAG=openslides-${SERVICE} export OPT_ARGS= if [ -n "${MODULE}" ]; then - export TAG=${TAG}${MODULE}- + export TAG=${TAG}-${MODULE} export OPT_ARGS="--build-arg MODULE=${MODULE} --build-arg PORT=${PORT}" fi -export TAG=${TAG}${CONTEXT} +if [ "${CONTEXT}" != "prod" ]; then export TAG="${TAG}-${CONTEXT}"; fi info "Building submodule '${SERVICE}' for ${CONTEXT} context" From 3d1ab6fbcd1e7bc3c1ff78af10b043b59fd3083f Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Tue, 10 Jun 2025 16:04:49 +0200 Subject: [PATCH 23/49] Small test action fix --- dev/actions/build-and-test-service/action-run.sh | 2 +- openslides-auth-service | 2 +- openslides-backend | 2 +- openslides-media-service | 2 +- openslides-proxy | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/actions/build-and-test-service/action-run.sh b/dev/actions/build-and-test-service/action-run.sh index 6dc7f9e95c..d586db646a 100644 --- a/dev/actions/build-and-test-service/action-run.sh +++ b/dev/actions/build-and-test-service/action-run.sh @@ -1,4 +1,4 @@ #!/bin/bash -bash dev/run-tests +bash dev/run-tests.sh diff --git a/openslides-auth-service b/openslides-auth-service index 6edb0bd4f5..bac04be66e 160000 --- a/openslides-auth-service +++ b/openslides-auth-service @@ -1 +1 @@ -Subproject commit 6edb0bd4f59284b234519ed0a5420c587bbdaafd +Subproject commit bac04be66e544917b6edaa00f2601aa3e6d91423 diff --git a/openslides-backend b/openslides-backend index 212a72cb1f..293f7fa160 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit 212a72cb1f6aaa2a50c7276ba155b3e7856ab404 +Subproject commit 293f7fa1609e7dc52deb87b114510513fb033e55 diff --git a/openslides-media-service b/openslides-media-service index 64ef196578..f46c4a9bbd 160000 --- a/openslides-media-service +++ b/openslides-media-service @@ -1 +1 @@ -Subproject commit 64ef196578caaadd2aba3f6490ef9df92a736b11 +Subproject commit f46c4a9bbd974946ce0309ca86e31bac8dbe9a94 diff --git a/openslides-proxy b/openslides-proxy index 0a9514cedf..b11de7f5ee 160000 --- a/openslides-proxy +++ b/openslides-proxy @@ -1 +1 @@ -Subproject commit 0a9514cedfde1676f6c67b1e6d27ac5c6ea0a194 +Subproject commit b11de7f5eea559cb862f3b4f32fa6c33090a0004 From 3c62d932e8448d71a7c8b76dd419615b4433ad28 Mon Sep 17 00:00:00 2001 From: Loki Elble Date: Tue, 10 Jun 2025 16:08:02 +0200 Subject: [PATCH 24/49] Staging update 20250610 --- openslides-autoupdate-service | 2 +- openslides-backend | 2 +- openslides-client | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service index e2631170b6..c6c47de7aa 160000 --- a/openslides-autoupdate-service +++ b/openslides-autoupdate-service @@ -1 +1 @@ -Subproject commit e2631170b69d2da11d5ab8c11c8a6db8c3840975 +Subproject commit c6c47de7aafd7dd5b8da59e3c1654fbec397759c diff --git a/openslides-backend b/openslides-backend index 8fe81dec38..9a3e8d4fbc 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit 8fe81dec38ba6986d9e585ad2a7c61e181ce8fbc +Subproject commit 9a3e8d4fbcf3878b404ac8d4eaefb4459f372720 diff --git a/openslides-client b/openslides-client index b039297635..e9f9b5b16c 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit b039297635984a4b753e3009a95777de41bd547a +Subproject commit e9f9b5b16c57503dc43c1aaf52a8d8659c043656 From cfd8a0a086c5fd4b6ccca3054449ace2b6bb9957 Mon Sep 17 00:00:00 2001 From: Loki Elble Date: Wed, 11 Jun 2025 16:03:38 +0200 Subject: [PATCH 25/49] Staging update 20250611 --- openslides-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openslides-client b/openslides-client index e9f9b5b16c..1ca35f5bb2 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit e9f9b5b16c57503dc43c1aaf52a8d8659c043656 +Subproject commit 1ca35f5bb215f0642001455c34cee08fe8ca8c69 From 359d72ccd35798f817fd3ffddcaa536cf44ac1c9 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Thu, 12 Jun 2025 09:51:58 +0200 Subject: [PATCH 26/49] Adjust Workflows --- openslides-auth-service | 2 +- openslides-autoupdate-service | 2 +- openslides-backend | 2 +- openslides-client | 2 +- openslides-datastore-service | 2 +- openslides-icc-service | 2 +- openslides-manage-service | 2 +- openslides-media-service | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openslides-auth-service b/openslides-auth-service index bac04be66e..d9b2d0dbbd 160000 --- a/openslides-auth-service +++ b/openslides-auth-service @@ -1 +1 @@ -Subproject commit bac04be66e544917b6edaa00f2601aa3e6d91423 +Subproject commit d9b2d0dbbdded4ec19afc00a444bcbe9db63ecc8 diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service index 2e8b2bd228..2f10aa3e56 160000 --- a/openslides-autoupdate-service +++ b/openslides-autoupdate-service @@ -1 +1 @@ -Subproject commit 2e8b2bd228898d98e2a3b4acfe9c7a4001dc3190 +Subproject commit 2f10aa3e5622eb183091d50a9aac0c93d7873c3d diff --git a/openslides-backend b/openslides-backend index 293f7fa160..5c4b0c816f 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit 293f7fa1609e7dc52deb87b114510513fb033e55 +Subproject commit 5c4b0c816f0e6c8d4e4f762004a4be502869b2fa diff --git a/openslides-client b/openslides-client index 62ecfe2a84..29f02b0311 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit 62ecfe2a8463be449dac2f02b1b1653f6afaa1a1 +Subproject commit 29f02b0311f0a57edc4007c066156d842c3583e5 diff --git a/openslides-datastore-service b/openslides-datastore-service index 868ac74f42..15bcef349f 160000 --- a/openslides-datastore-service +++ b/openslides-datastore-service @@ -1 +1 @@ -Subproject commit 868ac74f42aac45a91dcc213532f9c55ba2a7fee +Subproject commit 15bcef349f38958dea4c64fcd84eb149e94441d8 diff --git a/openslides-icc-service b/openslides-icc-service index 5fea936866..3760141a6a 160000 --- a/openslides-icc-service +++ b/openslides-icc-service @@ -1 +1 @@ -Subproject commit 5fea9368668523ea210b2389dc40a9e1a44b3d16 +Subproject commit 3760141a6ab5a5199920c37771fb717857066cb8 diff --git a/openslides-manage-service b/openslides-manage-service index 40062fca20..a014474d0a 160000 --- a/openslides-manage-service +++ b/openslides-manage-service @@ -1 +1 @@ -Subproject commit 40062fca20651939174d71b0e68c9be50e3fabee +Subproject commit a014474d0a057e37d06538f44955d64bd62f2f6b diff --git a/openslides-media-service b/openslides-media-service index f46c4a9bbd..e481108763 160000 --- a/openslides-media-service +++ b/openslides-media-service @@ -1 +1 @@ -Subproject commit f46c4a9bbd974946ce0309ca86e31bac8dbe9a94 +Subproject commit e4811087639ecb8cfe19e74142888657b34e217c From 48e3aae5ea3553b0e8aef9b47c1c76f571a885b4 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Thu, 12 Jun 2025 14:29:11 +0200 Subject: [PATCH 27/49] Adjust Workflows #3 --- openslides-auth-service | 2 +- openslides-autoupdate-service | 2 +- openslides-backend | 2 +- openslides-client | 2 +- openslides-datastore-service | 2 +- openslides-manage-service | 2 +- openslides-media-service | 2 +- openslides-search-service | 2 +- openslides-vote-service | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/openslides-auth-service b/openslides-auth-service index d9b2d0dbbd..72a50587bd 160000 --- a/openslides-auth-service +++ b/openslides-auth-service @@ -1 +1 @@ -Subproject commit d9b2d0dbbdded4ec19afc00a444bcbe9db63ecc8 +Subproject commit 72a50587bdd6921f4556ebb1ec8bf3d0bc9e215b diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service index 2f10aa3e56..f4b79867a1 160000 --- a/openslides-autoupdate-service +++ b/openslides-autoupdate-service @@ -1 +1 @@ -Subproject commit 2f10aa3e5622eb183091d50a9aac0c93d7873c3d +Subproject commit f4b79867a1b20a4037cc4855acd546481ba5b096 diff --git a/openslides-backend b/openslides-backend index 5c4b0c816f..e146d6978a 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit 5c4b0c816f0e6c8d4e4f762004a4be502869b2fa +Subproject commit e146d6978a45b5637bd14afc41412e430db9b292 diff --git a/openslides-client b/openslides-client index 29f02b0311..c42e34eb56 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit 29f02b0311f0a57edc4007c066156d842c3583e5 +Subproject commit c42e34eb563696e5481a2af8b350e5e0b752d314 diff --git a/openslides-datastore-service b/openslides-datastore-service index 15bcef349f..7d8b1862cd 160000 --- a/openslides-datastore-service +++ b/openslides-datastore-service @@ -1 +1 @@ -Subproject commit 15bcef349f38958dea4c64fcd84eb149e94441d8 +Subproject commit 7d8b1862cd7077e151c1eedb177948577df621d0 diff --git a/openslides-manage-service b/openslides-manage-service index a014474d0a..641524715c 160000 --- a/openslides-manage-service +++ b/openslides-manage-service @@ -1 +1 @@ -Subproject commit a014474d0a057e37d06538f44955d64bd62f2f6b +Subproject commit 641524715c48e34ef0e516cd98e25abe9ff223bf diff --git a/openslides-media-service b/openslides-media-service index e481108763..2633308bb4 160000 --- a/openslides-media-service +++ b/openslides-media-service @@ -1 +1 @@ -Subproject commit e4811087639ecb8cfe19e74142888657b34e217c +Subproject commit 2633308bb4171530f40d38b455cb7d0ee7be21e2 diff --git a/openslides-search-service b/openslides-search-service index e321d2a8a9..722ed1b96f 160000 --- a/openslides-search-service +++ b/openslides-search-service @@ -1 +1 @@ -Subproject commit e321d2a8a919152020077dbf1c631352d12f868a +Subproject commit 722ed1b96f07205198f19828ddfef2b4b6ea5506 diff --git a/openslides-vote-service b/openslides-vote-service index 2ae3dc9ba8..6e27f2c1e6 160000 --- a/openslides-vote-service +++ b/openslides-vote-service @@ -1 +1 @@ -Subproject commit 2ae3dc9ba8f8ae6e20a8faa95ab36d0f8bf2f403 +Subproject commit 6e27f2c1e6e9efebc57559f4b486e00f9cb3b1c4 From 66709737c9598bd4c398eea1673fdbde92b22b9b Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Thu, 12 Jun 2025 17:14:50 +0200 Subject: [PATCH 28/49] Fetch script update --- dev/scripts/git-fetch-and-merge-upstream.sh | 4 +++- openslides-datastore-service | 2 +- openslides-media-service | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dev/scripts/git-fetch-and-merge-upstream.sh b/dev/scripts/git-fetch-and-merge-upstream.sh index bf2fed9f04..4faf29479b 100644 --- a/dev/scripts/git-fetch-and-merge-upstream.sh +++ b/dev/scripts/git-fetch-and-merge-upstream.sh @@ -22,7 +22,9 @@ for DIR in $(git submodule foreach --recursive -q sh -c pwd); do # Git commit info "Fetch & merge for ${SUBMODULE} " && \ - git fetch upstream && \ + export GIT_UPDATE=$(git remote update upstream) && \ + export GIT_FETCH=$(git fetch upstream) && \ + if [ -z $GIT_FETCH ]; then echo "Nothing new to fetch and merge" && continue; fi &&\ export error=0 && \ git merge upstream/main || export error=1 && \ if [ $error -eq 1 ]; then (git commit && git push) ; fi && \ diff --git a/openslides-datastore-service b/openslides-datastore-service index 7d8b1862cd..b00529c469 160000 --- a/openslides-datastore-service +++ b/openslides-datastore-service @@ -1 +1 @@ -Subproject commit 7d8b1862cd7077e151c1eedb177948577df621d0 +Subproject commit b00529c46964b442a12cfdc99161ddcda65afcff diff --git a/openslides-media-service b/openslides-media-service index 2633308bb4..eeb6ad5ad9 160000 --- a/openslides-media-service +++ b/openslides-media-service @@ -1 +1 @@ -Subproject commit 2633308bb4171530f40d38b455cb7d0ee7be21e2 +Subproject commit eeb6ad5ad9ad75ebc6af1e5fcc8281ee6a295be7 From be17c55973f6492ec610be426e9392a5769a92cd Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Thu, 12 Jun 2025 17:36:05 +0200 Subject: [PATCH 29/49] Bump --- openslides-datastore-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openslides-datastore-service b/openslides-datastore-service index b00529c469..0d4b710914 160000 --- a/openslides-datastore-service +++ b/openslides-datastore-service @@ -1 +1 @@ -Subproject commit b00529c46964b442a12cfdc99161ddcda65afcff +Subproject commit 0d4b7109147c00fc6e7d18f727191859c424741d From 74cb740c66d6a6f03e3f8500e1b977724d835d98 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Mon, 16 Jun 2025 13:37:44 +0200 Subject: [PATCH 30/49] Remove command.sh from some Go Services --- openslides-autoupdate-service | 2 +- openslides-backend | 2 +- openslides-datastore-service | 2 +- openslides-icc-service | 2 +- openslides-manage-service | 2 +- openslides-search-service | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service index f4b79867a1..8890226f28 160000 --- a/openslides-autoupdate-service +++ b/openslides-autoupdate-service @@ -1 +1 @@ -Subproject commit f4b79867a1b20a4037cc4855acd546481ba5b096 +Subproject commit 8890226f28dd5fd423a8b8871f381995f89ca32d diff --git a/openslides-backend b/openslides-backend index e146d6978a..a1476ce773 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit e146d6978a45b5637bd14afc41412e430db9b292 +Subproject commit a1476ce773227aabd58b21232f2bcd03d8239ffd diff --git a/openslides-datastore-service b/openslides-datastore-service index 0d4b710914..32402d2229 160000 --- a/openslides-datastore-service +++ b/openslides-datastore-service @@ -1 +1 @@ -Subproject commit 0d4b7109147c00fc6e7d18f727191859c424741d +Subproject commit 32402d222952fefaefa61bfd6428487d727f79b8 diff --git a/openslides-icc-service b/openslides-icc-service index 3760141a6a..24dac04a70 160000 --- a/openslides-icc-service +++ b/openslides-icc-service @@ -1 +1 @@ -Subproject commit 3760141a6ab5a5199920c37771fb717857066cb8 +Subproject commit 24dac04a70716cd2a4c1e4140f90ee823887e0ec diff --git a/openslides-manage-service b/openslides-manage-service index 641524715c..7606296733 160000 --- a/openslides-manage-service +++ b/openslides-manage-service @@ -1 +1 @@ -Subproject commit 641524715c48e34ef0e516cd98e25abe9ff223bf +Subproject commit 7606296733fa677aab94074bc0c97c5468650b21 diff --git a/openslides-search-service b/openslides-search-service index 722ed1b96f..5d52f3fe89 160000 --- a/openslides-search-service +++ b/openslides-search-service @@ -1 +1 @@ -Subproject commit 722ed1b96f07205198f19828ddfef2b4b6ea5506 +Subproject commit 5d52f3fe8924608febcf9cfe78e41b14b7c58a12 From fb21a0ce8374a7d92175c9ead1e8085af28283ee Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Mon, 16 Jun 2025 13:52:42 +0200 Subject: [PATCH 31/49] Some more command.sh changes --- openslides-autoupdate-service | 2 +- openslides-icc-service | 2 +- openslides-search-service | 2 +- openslides-vote-service | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service index 8890226f28..d7412e6d5d 160000 --- a/openslides-autoupdate-service +++ b/openslides-autoupdate-service @@ -1 +1 @@ -Subproject commit 8890226f28dd5fd423a8b8871f381995f89ca32d +Subproject commit d7412e6d5d57bf969d3fb3e43362d23834f092a8 diff --git a/openslides-icc-service b/openslides-icc-service index 24dac04a70..a790909b48 160000 --- a/openslides-icc-service +++ b/openslides-icc-service @@ -1 +1 @@ -Subproject commit 24dac04a70716cd2a4c1e4140f90ee823887e0ec +Subproject commit a790909b4870b5a7839e3bef6595b5e2aa0d27fe diff --git a/openslides-search-service b/openslides-search-service index 5d52f3fe89..bf2a806da8 160000 --- a/openslides-search-service +++ b/openslides-search-service @@ -1 +1 @@ -Subproject commit 5d52f3fe8924608febcf9cfe78e41b14b7c58a12 +Subproject commit bf2a806da8d1f7137ad7fc6c4cd0e48e2b6140fd diff --git a/openslides-vote-service b/openslides-vote-service index 6e27f2c1e6..a59e0b260c 160000 --- a/openslides-vote-service +++ b/openslides-vote-service @@ -1 +1 @@ -Subproject commit 6e27f2c1e6e9efebc57559f4b486e00f9cb3b1c4 +Subproject commit a59e0b260c014aebed1787cfc475c1d6936329c1 From 430c02ec01e8fd996bf29175c62c9c29bd168f5c Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Mon, 16 Jun 2025 13:53:28 +0200 Subject: [PATCH 32/49] Dockerfile.Dev Workaround --- openslides-auth-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openslides-auth-service b/openslides-auth-service index 72a50587bd..a626121ba0 160000 --- a/openslides-auth-service +++ b/openslides-auth-service @@ -1 +1 @@ -Subproject commit 72a50587bdd6921f4556ebb1ec8bf3d0bc9e215b +Subproject commit a626121ba0db40c5856ac457f9d05c685d5b29b2 From f7c9bd6b9863a7ddc57b2d62c1e510a2e4221cc3 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Mon, 16 Jun 2025 13:56:11 +0200 Subject: [PATCH 33/49] Merge with upstream --- dev/scripts/git-fetch-and-merge-upstream.sh | 1 - openslides-auth-service | 2 +- openslides-client | 2 +- openslides-datastore-service | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dev/scripts/git-fetch-and-merge-upstream.sh b/dev/scripts/git-fetch-and-merge-upstream.sh index 4faf29479b..9360df1e09 100644 --- a/dev/scripts/git-fetch-and-merge-upstream.sh +++ b/dev/scripts/git-fetch-and-merge-upstream.sh @@ -24,7 +24,6 @@ for DIR in $(git submodule foreach --recursive -q sh -c pwd); do info "Fetch & merge for ${SUBMODULE} " && \ export GIT_UPDATE=$(git remote update upstream) && \ export GIT_FETCH=$(git fetch upstream) && \ - if [ -z $GIT_FETCH ]; then echo "Nothing new to fetch and merge" && continue; fi &&\ export error=0 && \ git merge upstream/main || export error=1 && \ if [ $error -eq 1 ]; then (git commit && git push) ; fi && \ diff --git a/openslides-auth-service b/openslides-auth-service index a626121ba0..d6b6b38889 160000 --- a/openslides-auth-service +++ b/openslides-auth-service @@ -1 +1 @@ -Subproject commit a626121ba0db40c5856ac457f9d05c685d5b29b2 +Subproject commit d6b6b388897e73fd96cc6671c20c904920d909d5 diff --git a/openslides-client b/openslides-client index c42e34eb56..2f0feb510d 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit c42e34eb563696e5481a2af8b350e5e0b752d314 +Subproject commit 2f0feb510dbf4e6b5082969875dfd64b5ce962a7 diff --git a/openslides-datastore-service b/openslides-datastore-service index 32402d2229..a2cc35b35f 160000 --- a/openslides-datastore-service +++ b/openslides-datastore-service @@ -1 +1 @@ -Subproject commit 32402d222952fefaefa61bfd6428487d727f79b8 +Subproject commit a2cc35b35f79d597a02439825259702c9ad36c45 From ef8e3eb2c03b1c1ccb54b0c1b03c4ec37c44e2d2 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Mon, 16 Jun 2025 15:15:38 +0200 Subject: [PATCH 34/49] Removing old Dockerfiles --- openslides-backend | 2 +- openslides-client | 2 +- openslides-datastore-service | 2 +- openslides-manage-service | 2 +- openslides-vote-service | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openslides-backend b/openslides-backend index a1476ce773..e414eed98a 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit a1476ce773227aabd58b21232f2bcd03d8239ffd +Subproject commit e414eed98a2602b826ab74447a122096e879b4ca diff --git a/openslides-client b/openslides-client index 2f0feb510d..036205e413 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit 2f0feb510dbf4e6b5082969875dfd64b5ce962a7 +Subproject commit 036205e4130b4bb73c15643631769ca9fc830029 diff --git a/openslides-datastore-service b/openslides-datastore-service index a2cc35b35f..df3b578892 160000 --- a/openslides-datastore-service +++ b/openslides-datastore-service @@ -1 +1 @@ -Subproject commit a2cc35b35f79d597a02439825259702c9ad36c45 +Subproject commit df3b578892207611b806ec531097959a8ecca75c diff --git a/openslides-manage-service b/openslides-manage-service index 7606296733..14d58f2e3b 160000 --- a/openslides-manage-service +++ b/openslides-manage-service @@ -1 +1 @@ -Subproject commit 7606296733fa677aab94074bc0c97c5468650b21 +Subproject commit 14d58f2e3bcd67145a148b6d3a2270b7697d8c87 diff --git a/openslides-vote-service b/openslides-vote-service index a59e0b260c..2a40cf8b40 160000 --- a/openslides-vote-service +++ b/openslides-vote-service @@ -1 +1 @@ -Subproject commit a59e0b260c014aebed1787cfc475c1d6936329c1 +Subproject commit 2a40cf8b40547ca892c95d84c6b423ad1811e508 From 12e9b9136736ee42efbd4e989ff9c7465aaf90aa Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Mon, 16 Jun 2025 15:44:01 +0200 Subject: [PATCH 35/49] Merge with upstream --- openslides-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openslides-client b/openslides-client index 036205e413..b6cabc4277 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit 036205e4130b4bb73c15643631769ca9fc830029 +Subproject commit b6cabc4277341b1347f0acae84d53a411b37e641 From 2192974eea6150ea468c31f9b6c7c1909ae6287a Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Mon, 16 Jun 2025 15:53:21 +0200 Subject: [PATCH 36/49] Go Update --- lib/openslides-go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/openslides-go b/lib/openslides-go index 8aac50248e..e9269a9aa4 160000 --- a/lib/openslides-go +++ b/lib/openslides-go @@ -1 +1 @@ -Subproject commit 8aac50248ebfa6bdd37d25590d87f6095adfb012 +Subproject commit e9269a9aa4d7aae0da8aa4c11f6c9b76abc50b6c From 5d2610dc54df80dc008780c8f50e24ea15afe7c3 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Tue, 17 Jun 2025 11:25:45 +0200 Subject: [PATCH 37/49] Merge with main & Workflow check --- dev/scripts/git-fetch-and-merge-upstream.sh | 37 +++++++++++++++++---- openslides-auth-service | 2 +- openslides-backend | 2 +- openslides-client | 2 +- openslides-search-service | 2 +- 5 files changed, 34 insertions(+), 11 deletions(-) diff --git a/dev/scripts/git-fetch-and-merge-upstream.sh b/dev/scripts/git-fetch-and-merge-upstream.sh index 9360df1e09..c04fbf0ad8 100644 --- a/dev/scripts/git-fetch-and-merge-upstream.sh +++ b/dev/scripts/git-fetch-and-merge-upstream.sh @@ -7,6 +7,32 @@ export SINGLE_TARGET=$1 +fetch_merge_push() { + export SUBMODULE=$1 + export SOURCE=$2 + + info "Fetch & merge for ${SUBMODULE} " + export GIT_UPDATE=$(git remote update $SOURCE) + export GIT_FETCH=$(git fetch $SOURCE) + export ERROR=0 && \ + git merge $SOURCE/main || export ERROR=1 + + if [ $SOURCE == 'origin' ]; then return; fi + + if [ $ERROR == 1 ]; then (git commit && git push) ; fi + if [ $ERROR == 0 ]; then (git push) ; fi +} + +update_meta(){ + if [ -d "meta" ] + then + cd meta + (fetch_merge_push meta origin) + cd .. + fi +} + + IFS=$'\n' for DIR in $(git submodule foreach --recursive -q sh -c pwd); do # Extract submodule name @@ -20,13 +46,10 @@ for DIR in $(git submodule foreach --recursive -q sh -c pwd); do # Check for single target if [ $# -eq 2 ]; then if [[ $SINGLE_TARGET != $SUBMODULE ]]; then continue; fi; fi && \ + # Recursively Update Meta too + update_meta && \ + # Git commit - info "Fetch & merge for ${SUBMODULE} " && \ - export GIT_UPDATE=$(git remote update upstream) && \ - export GIT_FETCH=$(git fetch upstream) && \ - export error=0 && \ - git merge upstream/main || export error=1 && \ - if [ $error -eq 1 ]; then (git commit && git push) ; fi && \ - if [ $error -eq 0 ]; then (git push) ; fi + fetch_merge_push ${SUBMODULE} upstream done wait \ No newline at end of file diff --git a/openslides-auth-service b/openslides-auth-service index d6b6b38889..285098a2c4 160000 --- a/openslides-auth-service +++ b/openslides-auth-service @@ -1 +1 @@ -Subproject commit d6b6b388897e73fd96cc6671c20c904920d909d5 +Subproject commit 285098a2c4bbec47a4f027ccc44585df12536cd8 diff --git a/openslides-backend b/openslides-backend index e414eed98a..bea34ca4f7 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit e414eed98a2602b826ab74447a122096e879b4ca +Subproject commit bea34ca4f72a8502c865fe7255ff61cabdcd65ea diff --git a/openslides-client b/openslides-client index b6cabc4277..a031d1d53d 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit b6cabc4277341b1347f0acae84d53a411b37e641 +Subproject commit a031d1d53d18891967d1b5fda5bae37d2fde9b3f diff --git a/openslides-search-service b/openslides-search-service index bf2a806da8..399201eaf6 160000 --- a/openslides-search-service +++ b/openslides-search-service @@ -1 +1 @@ -Subproject commit bf2a806da8d1f7137ad7fc6c4cd0e48e2b6140fd +Subproject commit 399201eaf6ef1031af28df4dadb34ec3b1df9682 From c98c57cc6a81e6d943b0fc09cb666bcd7cd389b7 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Tue, 17 Jun 2025 11:43:03 +0200 Subject: [PATCH 38/49] Final changes --- openslides-backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openslides-backend b/openslides-backend index bea34ca4f7..5ceb38b8e3 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit bea34ca4f72a8502c865fe7255ff61cabdcd65ea +Subproject commit 5ceb38b8e383b4b2c4872a9131f216d72502f925 From 4986664b9d89424a6c0329f4fca16b7ba920e1d7 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Tue, 17 Jun 2025 12:40:01 +0200 Subject: [PATCH 39/49] Create unified and standardized continuous integration workflow for each service --- openslides-auth-service | 2 +- openslides-autoupdate-service | 2 +- openslides-backend | 2 +- openslides-client | 2 +- openslides-datastore-service | 2 +- openslides-icc-service | 2 +- openslides-manage-service | 2 +- openslides-media-service | 2 +- openslides-search-service | 2 +- openslides-vote-service | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/openslides-auth-service b/openslides-auth-service index 285098a2c4..a4f92109d8 160000 --- a/openslides-auth-service +++ b/openslides-auth-service @@ -1 +1 @@ -Subproject commit 285098a2c4bbec47a4f027ccc44585df12536cd8 +Subproject commit a4f92109d89162a82471e228f9e6b5c7c8bbd456 diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service index d7412e6d5d..89eaddb08d 160000 --- a/openslides-autoupdate-service +++ b/openslides-autoupdate-service @@ -1 +1 @@ -Subproject commit d7412e6d5d57bf969d3fb3e43362d23834f092a8 +Subproject commit 89eaddb08de47a543c3a3af0bdf088728825af1c diff --git a/openslides-backend b/openslides-backend index 5ceb38b8e3..7d3bd3ad3b 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit 5ceb38b8e383b4b2c4872a9131f216d72502f925 +Subproject commit 7d3bd3ad3b52c3f6faed481162b777632cb1961d diff --git a/openslides-client b/openslides-client index a031d1d53d..a1a70d0717 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit a031d1d53d18891967d1b5fda5bae37d2fde9b3f +Subproject commit a1a70d0717961f00391fe5db9e90a8200974a7c7 diff --git a/openslides-datastore-service b/openslides-datastore-service index df3b578892..84b907c1f0 160000 --- a/openslides-datastore-service +++ b/openslides-datastore-service @@ -1 +1 @@ -Subproject commit df3b578892207611b806ec531097959a8ecca75c +Subproject commit 84b907c1f0a6a8baa735683bb838cdf0094039df diff --git a/openslides-icc-service b/openslides-icc-service index a790909b48..7f534dfdc3 160000 --- a/openslides-icc-service +++ b/openslides-icc-service @@ -1 +1 @@ -Subproject commit a790909b4870b5a7839e3bef6595b5e2aa0d27fe +Subproject commit 7f534dfdc351b29fc31c356626483b5c66ccac15 diff --git a/openslides-manage-service b/openslides-manage-service index 14d58f2e3b..6d1b0eac48 160000 --- a/openslides-manage-service +++ b/openslides-manage-service @@ -1 +1 @@ -Subproject commit 14d58f2e3bcd67145a148b6d3a2270b7697d8c87 +Subproject commit 6d1b0eac4873cce21149602d66f2b92f4d4c3200 diff --git a/openslides-media-service b/openslides-media-service index eeb6ad5ad9..410baa5129 160000 --- a/openslides-media-service +++ b/openslides-media-service @@ -1 +1 @@ -Subproject commit eeb6ad5ad9ad75ebc6af1e5fcc8281ee6a295be7 +Subproject commit 410baa51293dcc9f3ffe8a3ecbe11f2d4a01c282 diff --git a/openslides-search-service b/openslides-search-service index 399201eaf6..4bf6c8ad07 160000 --- a/openslides-search-service +++ b/openslides-search-service @@ -1 +1 @@ -Subproject commit 399201eaf6ef1031af28df4dadb34ec3b1df9682 +Subproject commit 4bf6c8ad07fe01b356eca1d5a9b215e664b0856c diff --git a/openslides-vote-service b/openslides-vote-service index 2a40cf8b40..5f59867084 160000 --- a/openslides-vote-service +++ b/openslides-vote-service @@ -1 +1 @@ -Subproject commit 2a40cf8b40547ca892c95d84c6b423ad1811e508 +Subproject commit 5f59867084bcf7072ae5ac44f246fed96ddcec40 From 5850e5a2c15865c22a4e52fa83f92058e84977a6 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Tue, 17 Jun 2025 13:48:57 +0200 Subject: [PATCH 40/49] Small fixes, Typos and Standards --- openslides-auth-service | 2 +- openslides-autoupdate-service | 2 +- openslides-client | 2 +- openslides-datastore-service | 2 +- openslides-manage-service | 2 +- openslides-media-service | 2 +- openslides-search-service | 2 +- openslides-vote-service | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openslides-auth-service b/openslides-auth-service index a4f92109d8..2aba45eb06 160000 --- a/openslides-auth-service +++ b/openslides-auth-service @@ -1 +1 @@ -Subproject commit a4f92109d89162a82471e228f9e6b5c7c8bbd456 +Subproject commit 2aba45eb06228a32f50b1de9bf5581d178452a99 diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service index 89eaddb08d..4a2fa69068 160000 --- a/openslides-autoupdate-service +++ b/openslides-autoupdate-service @@ -1 +1 @@ -Subproject commit 89eaddb08de47a543c3a3af0bdf088728825af1c +Subproject commit 4a2fa69068355ad8d1994e39873d2042d1e77df6 diff --git a/openslides-client b/openslides-client index a1a70d0717..3580538c0c 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit a1a70d0717961f00391fe5db9e90a8200974a7c7 +Subproject commit 3580538c0cafa3a79662d1539c948d5e1fcf6d58 diff --git a/openslides-datastore-service b/openslides-datastore-service index 84b907c1f0..996857f209 160000 --- a/openslides-datastore-service +++ b/openslides-datastore-service @@ -1 +1 @@ -Subproject commit 84b907c1f0a6a8baa735683bb838cdf0094039df +Subproject commit 996857f2098b5c7af862bdc6c9d8d8e2b13afd9b diff --git a/openslides-manage-service b/openslides-manage-service index 6d1b0eac48..bf53a6e9a2 160000 --- a/openslides-manage-service +++ b/openslides-manage-service @@ -1 +1 @@ -Subproject commit 6d1b0eac4873cce21149602d66f2b92f4d4c3200 +Subproject commit bf53a6e9a22339832f2db7c6e0718ac733ed3f1f diff --git a/openslides-media-service b/openslides-media-service index 410baa5129..911d2cf952 160000 --- a/openslides-media-service +++ b/openslides-media-service @@ -1 +1 @@ -Subproject commit 410baa51293dcc9f3ffe8a3ecbe11f2d4a01c282 +Subproject commit 911d2cf952212d80aa9a3bd4359f20b43ce975ea diff --git a/openslides-search-service b/openslides-search-service index 4bf6c8ad07..563a0c9299 160000 --- a/openslides-search-service +++ b/openslides-search-service @@ -1 +1 @@ -Subproject commit 4bf6c8ad07fe01b356eca1d5a9b215e664b0856c +Subproject commit 563a0c9299ac9c2ee2c7122c7063589c216c00fe diff --git a/openslides-vote-service b/openslides-vote-service index 5f59867084..0510597d66 160000 --- a/openslides-vote-service +++ b/openslides-vote-service @@ -1 +1 @@ -Subproject commit 5f59867084bcf7072ae5ac44f246fed96ddcec40 +Subproject commit 0510597d66e398e81034ea6c49f38a3744d31490 From 12ea9dfeb35eedeffa56343eb5198d26c66e2e5f Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Thu, 19 Jun 2025 10:25:26 +0200 Subject: [PATCH 41/49] Update Submodule References --- openslides-auth-service | 2 +- openslides-autoupdate-service | 2 +- openslides-backend | 2 +- openslides-client | 2 +- openslides-datastore-service | 2 +- openslides-icc-service | 2 +- openslides-manage-service | 2 +- openslides-media-service | 2 +- openslides-search-service | 2 +- openslides-vote-service | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/openslides-auth-service b/openslides-auth-service index 2aba45eb06..fb97f110cb 160000 --- a/openslides-auth-service +++ b/openslides-auth-service @@ -1 +1 @@ -Subproject commit 2aba45eb06228a32f50b1de9bf5581d178452a99 +Subproject commit fb97f110cbb235e0c1adc7c13f531344639875f5 diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service index 4a2fa69068..3706631349 160000 --- a/openslides-autoupdate-service +++ b/openslides-autoupdate-service @@ -1 +1 @@ -Subproject commit 4a2fa69068355ad8d1994e39873d2042d1e77df6 +Subproject commit 370663134998b19ef83bd3eb6f8c3b94869b99f7 diff --git a/openslides-backend b/openslides-backend index 7d3bd3ad3b..b8808d0682 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit 7d3bd3ad3b52c3f6faed481162b777632cb1961d +Subproject commit b8808d0682721b69c7d6890f167c3eec1b583474 diff --git a/openslides-client b/openslides-client index 3580538c0c..553e4ab554 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit 3580538c0cafa3a79662d1539c948d5e1fcf6d58 +Subproject commit 553e4ab55407e0840cdebc036bcf491b87bcd504 diff --git a/openslides-datastore-service b/openslides-datastore-service index 996857f209..5b14f9f8ef 160000 --- a/openslides-datastore-service +++ b/openslides-datastore-service @@ -1 +1 @@ -Subproject commit 996857f2098b5c7af862bdc6c9d8d8e2b13afd9b +Subproject commit 5b14f9f8ef1da598b53275f790d9b935d4ce18ad diff --git a/openslides-icc-service b/openslides-icc-service index 7f534dfdc3..c59d155f10 160000 --- a/openslides-icc-service +++ b/openslides-icc-service @@ -1 +1 @@ -Subproject commit 7f534dfdc351b29fc31c356626483b5c66ccac15 +Subproject commit c59d155f10b48e8792ee9ed3cfb5606727bc76d1 diff --git a/openslides-manage-service b/openslides-manage-service index bf53a6e9a2..f8c00a339c 160000 --- a/openslides-manage-service +++ b/openslides-manage-service @@ -1 +1 @@ -Subproject commit bf53a6e9a22339832f2db7c6e0718ac733ed3f1f +Subproject commit f8c00a339ccd3c54cca7b0f467ce3f9b784b4815 diff --git a/openslides-media-service b/openslides-media-service index 911d2cf952..c54c2e83a2 160000 --- a/openslides-media-service +++ b/openslides-media-service @@ -1 +1 @@ -Subproject commit 911d2cf952212d80aa9a3bd4359f20b43ce975ea +Subproject commit c54c2e83a2988ad6d7ea66d360cb57a580e99809 diff --git a/openslides-search-service b/openslides-search-service index 563a0c9299..432dbe700b 160000 --- a/openslides-search-service +++ b/openslides-search-service @@ -1 +1 @@ -Subproject commit 563a0c9299ac9c2ee2c7122c7063589c216c00fe +Subproject commit 432dbe700b8fb9654da250be413b618abfa22ae7 diff --git a/openslides-vote-service b/openslides-vote-service index 0510597d66..1566392c4a 160000 --- a/openslides-vote-service +++ b/openslides-vote-service @@ -1 +1 @@ -Subproject commit 0510597d66e398e81034ea6c49f38a3744d31490 +Subproject commit 1566392c4a1c1076b4000d49593860d9def0110f From 13d54b831fe06d3cf70d29894f7ff1007dbb123e Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Thu, 19 Jun 2025 10:26:06 +0200 Subject: [PATCH 42/49] Bump --- openslides-icc-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openslides-icc-service b/openslides-icc-service index c59d155f10..9ce1c0464d 160000 --- a/openslides-icc-service +++ b/openslides-icc-service @@ -1 +1 @@ -Subproject commit c59d155f10b48e8792ee9ed3cfb5606727bc76d1 +Subproject commit 9ce1c0464d23e87c3b31749d1459fca11e71c118 From 2a2a94daa0230fb1029657a22caafe8c60c32201 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Mon, 23 Jun 2025 10:09:35 +0200 Subject: [PATCH 43/49] Adding Build instruction to dev compose file --- dev/docker/docker-compose.dev.yml | 64 +++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dev/docker/docker-compose.dev.yml b/dev/docker/docker-compose.dev.yml index fe7f158242..389d4ef353 100644 --- a/dev/docker/docker-compose.dev.yml +++ b/dev/docker/docker-compose.dev.yml @@ -1,6 +1,13 @@ version: "3" services: datastore-reader: + build: + context: ../../openslides-datastore-service + target: "dev" + args: + CONTEXT: "dev" + MODULE: "reader" + PORT: "9010" image: openslides-datastore-reader-dev depends_on: - postgres @@ -15,6 +22,13 @@ services: - 5680:5678 datastore-writer: + build: + context: ../../openslides-datastore-service + target: "dev" + args: + CONTEXT: "dev" + MODULE: "writer" + PORT: "9011" image: openslides-datastore-writer-dev depends_on: - postgres @@ -37,6 +51,11 @@ services: - POSTGRES_DB=openslides client: + build: + context: ../../openslides-client + target: "dev" + args: + CONTEXT: "dev" image: openslides-client-dev env_file: services.env environment: @@ -46,6 +65,11 @@ services: - ../../openslides-client/client/cli:/app/cli backend: + build: + context: ../../openslides-backend + target: "dev" + args: + CONTEXT: "dev" image: openslides-backend-dev depends_on: - datastore-reader @@ -77,6 +101,11 @@ services: - ../../openslides-backend/scripts:/app/scripts autoupdate: + build: + context: ../../openslides-autoupdate-service + target: "dev" + args: + CONTEXT: "dev" image: openslides-autoupdate-dev depends_on: - datastore-reader @@ -95,6 +124,11 @@ services: - "9012:9012" icc: + build: + context: ../../openslides-icc-service + target: "dev" + args: + CONTEXT: "dev" image: openslides-icc-dev depends_on: - datastore-reader @@ -112,6 +146,11 @@ services: - "9007:9007" search: + build: + context: ../../openslides-search-service + target: "dev" + args: + CONTEXT: "dev" image: openslides-search-dev depends_on: - autoupdate @@ -129,6 +168,11 @@ services: - "9050:9050" auth: + build: + context: ../../openslides-auth-service + target: "dev" + args: + CONTEXT: "dev" image: openslides-auth-dev depends_on: - datastore-reader @@ -142,6 +186,11 @@ services: - "9004:9004" media: + build: + context: ../../openslides-media-service + target: "dev" + args: + CONTEXT: "dev" image: openslides-media-dev depends_on: - backend @@ -153,6 +202,11 @@ services: - ../../openslides-media-service/src:/app/src manage: + build: + context: ../../openslides-manage-service + target: "dev" + args: + CONTEXT: "dev" image: openslides-manage-dev depends_on: - auth @@ -169,6 +223,11 @@ services: - "6379:6379" proxy: + build: + context: ../../openslides-proxy + target: "dev" + args: + CONTEXT: "dev" image: openslides-proxy-dev depends_on: - client @@ -185,6 +244,11 @@ services: - "8025:8025" # web ui to check mails manually vote: + build: + context: ../../openslides-vote-service + target: "dev" + args: + CONTEXT: "dev" image: openslides-vote-dev depends_on: - auth From b9d2ed5fcd4840e65035c4052fcf70c6af881af5 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Mon, 23 Jun 2025 13:45:11 +0200 Subject: [PATCH 44/49] Add Shellcheck Linter --- dev/scripts/lint-shell-scripts.sh | 37 +++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 dev/scripts/lint-shell-scripts.sh diff --git a/dev/scripts/lint-shell-scripts.sh b/dev/scripts/lint-shell-scripts.sh new file mode 100644 index 0000000000..8ac5e3fc80 --- /dev/null +++ b/dev/scripts/lint-shell-scripts.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +# Import OpenSlides utils package +. $( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/util.sh + +export SINGLE_TARGET=$1 + +lint_all_files() { + # Finds all files with a valid shebang at the beginning. Grep outputs the filename as well as the shebang itself. + # The shebang is cut out so that only the filename remains. This filename is then used as an input parameter for shellcheck + find . -type f -exec grep -EH '^#!(.*/|.*env +)(sh|bash|ksh)' {} \; | cut -d: -f1 | xargs shellcheck + info $? +} + +# This uses Shellcheck (https://github.com/koalaman/shellcheck) to lint all Service Dockerfiles + +# Call Shellcheck on each Submodule shell-scripts +LOCAL_PWD=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +IFS=$'\n' +for DIR in $(git submodule foreach --recursive -q sh -c pwd); do + # Extract submodule name + cd "$DIR" && \ + export DIRNAME=${PWD##*/} && \ + export SUBMODULE=${DIRNAME//"openslides-"} && \ + if [ $SUBMODULE == 'meta' ]; then continue; fi && \ + if [ $SUBMODULE == 'go' ]; then continue; fi && \ + + # Check for single target + if [ $# -eq 1 ]; then if [[ $SINGLE_TARGET != $SUBMODULE ]]; then continue; fi; fi && \ + + # Execute test + info " Linting shell-scripts for ${SUBMODULE}:" && \ + lint_all_files +done + +wait \ No newline at end of file From e40c93094a3c4c9c68eab7f9fda2eae6f81cb349 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Mon, 23 Jun 2025 15:06:53 +0200 Subject: [PATCH 45/49] Lint scripts via Shellcheck --- dev/scripts/git-fetch-and-merge-upstream.sh | 44 ++++++++++++-------- dev/scripts/git-push-all-submodules.sh | 19 +++++---- dev/scripts/git-setup-forked-submodule.sh | 18 +++++--- dev/scripts/lint-dockerfiles.sh | 22 ++++++---- dev/scripts/lint-shell-scripts.sh | 26 +++++++----- dev/scripts/makefile/build-all-submodules.sh | 19 +++++---- dev/scripts/makefile/build-service.sh | 6 +-- dev/scripts/makefile/test-all-submodules.sh | 23 ++++++---- openslides-auth-service | 2 +- openslides-autoupdate-service | 2 +- openslides-backend | 2 +- openslides-client | 2 +- openslides-datastore-service | 2 +- openslides-manage-service | 2 +- openslides-media-service | 2 +- openslides-search-service | 2 +- openslides-vote-service | 2 +- 17 files changed, 117 insertions(+), 78 deletions(-) diff --git a/dev/scripts/git-fetch-and-merge-upstream.sh b/dev/scripts/git-fetch-and-merge-upstream.sh index c04fbf0ad8..eb17b7b0ec 100644 --- a/dev/scripts/git-fetch-and-merge-upstream.sh +++ b/dev/scripts/git-fetch-and-merge-upstream.sh @@ -1,7 +1,7 @@ #!/bin/bash # Import OpenSlides utils package -. $( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/util.sh +. "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/util.sh" # Fetches and merges all submodules with their respective upstream/main repositories. @@ -12,23 +12,28 @@ fetch_merge_push() { export SOURCE=$2 info "Fetch & merge for ${SUBMODULE} " - export GIT_UPDATE=$(git remote update $SOURCE) - export GIT_FETCH=$(git fetch $SOURCE) - export ERROR=0 && \ - git merge $SOURCE/main || export ERROR=1 - if [ $SOURCE == 'origin' ]; then return; fi + GIT_UPDATE=$(git remote update "$SOURCE") + export GIT_UPDATE + GIT_FETCH=$(git fetch "$SOURCE") + export GIT_FETCH - if [ $ERROR == 1 ]; then (git commit && git push) ; fi - if [ $ERROR == 0 ]; then (git push) ; fi + export ERROR=0 + git merge "$SOURCE"/main || export ERROR=1 + + if [ "$SOURCE" == 'origin' ]; then return; fi + + if [ "$ERROR" == 1 ]; then (git commit && git push) ; fi + if [ "$ERROR" == 0 ]; then (git push) ; fi } update_meta(){ if [ -d "meta" ] then - cd meta - (fetch_merge_push meta origin) - cd .. + ( + cd meta || exit + (fetch_merge_push meta origin) + ) fi } @@ -36,20 +41,23 @@ update_meta(){ IFS=$'\n' for DIR in $(git submodule foreach --recursive -q sh -c pwd); do # Extract submodule name - cd "$DIR" && \ - export DIRNAME=${PWD##*/} && \ - export SUBMODULE=${DIRNAME//"openslides-"} && \ + cd "$DIR" || exit && \ + + DIRNAME=${PWD##*/} && \ + export DIRNAME && \ + SUBMODULE=${DIRNAME//"openslides-"} && \ + export SUBMODULE && \ - if [ $SUBMODULE == 'go' ]; then continue; fi && \ - if [ $SUBMODULE == 'meta' ]; then continue; fi && \ + if [ "$SUBMODULE" == 'go' ]; then continue; fi && \ + if [ "$SUBMODULE" == 'meta' ]; then continue; fi && \ # Check for single target - if [ $# -eq 2 ]; then if [[ $SINGLE_TARGET != $SUBMODULE ]]; then continue; fi; fi && \ + if [ $# -eq 2 ]; then if [[ "$SINGLE_TARGET" != "$SUBMODULE" ]]; then continue; fi; fi && \ # Recursively Update Meta too update_meta && \ # Git commit - fetch_merge_push ${SUBMODULE} upstream + fetch_merge_push "${SUBMODULE}" upstream done wait \ No newline at end of file diff --git a/dev/scripts/git-push-all-submodules.sh b/dev/scripts/git-push-all-submodules.sh index 1cae1f9443..8f9fe51fa9 100644 --- a/dev/scripts/git-push-all-submodules.sh +++ b/dev/scripts/git-push-all-submodules.sh @@ -1,7 +1,7 @@ #!/bin/bash # Import OpenSlides utils package -. $( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/util.sh +. "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/util.sh" # Commits and pushes all submodules to their respective repositories. # The same Commit Message is reused for all Commits @@ -20,20 +20,23 @@ export SINGLE_TARGET=$2 IFS=$'\n' for DIR in $(git submodule foreach --recursive -q sh -c pwd); do # Extract submodule name - cd "$DIR" && \ - export DIRNAME=${PWD##*/} && \ - export SUBMODULE=${DIRNAME//"openslides-"} && \ + cd "$DIR" || exit && \ - if [ $SUBMODULE == 'go' ]; then continue; fi && \ - if [ $SUBMODULE == 'meta' ]; then continue; fi && \ + DIRNAME=${PWD##*/} && \ + export DIRNAME && \ + SUBMODULE=${DIRNAME//"openslides-"} && \ + export SUBMODULE && \ + + if [ "$SUBMODULE" == 'go' ]; then continue; fi && \ + if [ "$SUBMODULE" == 'meta' ]; then continue; fi && \ # Check for single target - if [ $# -eq 2 ]; then if [[ $SINGLE_TARGET != $SUBMODULE ]]; then continue; fi; fi && \ + if [ $# -eq 2 ]; then if [[ "$SINGLE_TARGET" != "$SUBMODULE" ]]; then continue; fi; fi && \ # Git commit info "Commit & push for ${SUBMODULE} " && \ git add -u . && \ - git commit -a -m $MESSAGE && \ + git commit -a -m "$MESSAGE" && \ git push done wait \ No newline at end of file diff --git a/dev/scripts/git-setup-forked-submodule.sh b/dev/scripts/git-setup-forked-submodule.sh index be9082e29c..47def6d4f2 100644 --- a/dev/scripts/git-setup-forked-submodule.sh +++ b/dev/scripts/git-setup-forked-submodule.sh @@ -1,13 +1,21 @@ +#!/bin/bash + +# Import OpenSlides utils package +. "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/util.sh" + # Creates a remote to given submodule. # Call this from project root path # Parameter #1 : abbreviated name of the submodule (eg. auth-service, backend, proxy, icc-service) # Parameter #2 : name of your github fork repository -if [ -z $1 ]; then echo "Parameter #1 missing"; exit; fi -if [ -z $2 ]; then echo "Parameter #2 missing"; exit; fi +if [ -z "$1" ]; then echo "Parameter #1 missing"; exit; fi +if [ -z "$2" ]; then echo "Parameter #2 missing"; exit; fi + +info "Forking $2/openslides-$1" -cd ./openslides-$1 +( +cd ./openslides-"$1" || exit git remote rename origin upstream -git remote add origin git@github.com:$2/openslides-$1.git +git remote add origin git@github.com:"$2"/openslides-"$1".git git fetch upstream git remote -v -cd .. \ No newline at end of file +) \ No newline at end of file diff --git a/dev/scripts/lint-dockerfiles.sh b/dev/scripts/lint-dockerfiles.sh index 3825cb189f..b067785376 100644 --- a/dev/scripts/lint-dockerfiles.sh +++ b/dev/scripts/lint-dockerfiles.sh @@ -1,7 +1,7 @@ #!/bin/bash # Import OpenSlides utils package -. $( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/util.sh +. "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/util.sh" export SINGLE_TARGET=$1 @@ -14,19 +14,23 @@ LOCAL_PWD=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) IFS=$'\n' for DIR in $(git submodule foreach --recursive -q sh -c pwd); do - # Extract submodule name - cd "$DIR" && \ - export DIRNAME=${PWD##*/} && \ - export SUBMODULE=${DIRNAME//"openslides-"} && \ - if [ $SUBMODULE == 'meta' ]; then continue; fi && \ - if [ $SUBMODULE == 'go' ]; then continue; fi && \ + # Extract submodule name + cd "$DIR" || exit && \ + + DIRNAME=${PWD##*/} && \ + export DIRNAME && \ + SUBMODULE=${DIRNAME//"openslides-"} && \ + export SUBMODULE && \ + + if [ "$SUBMODULE" == 'go' ]; then continue; fi && \ + if [ "$SUBMODULE" == 'meta' ]; then continue; fi && \ # Check for single target - if [ $# -eq 1 ]; then if [[ $SINGLE_TARGET != $SUBMODULE ]]; then continue; fi; fi && \ + if [ $# -eq 1 ]; then if [[ "$SINGLE_TARGET" != "$SUBMODULE" ]]; then continue; fi; fi && \ # Execute test info " Linting Dockerfile for ${SUBMODULE}:" && \ - docker run --rm -i -v /${LOCAL_PWD}/.hadolint.yaml:/.config/hadolint.yaml ghcr.io/hadolint/hadolint < Dockerfile + docker run --rm -i -v /"${LOCAL_PWD}"/.hadolint.yaml:/.config/hadolint.yaml ghcr.io/hadolint/hadolint < Dockerfile done wait \ No newline at end of file diff --git a/dev/scripts/lint-shell-scripts.sh b/dev/scripts/lint-shell-scripts.sh index 8ac5e3fc80..6a6462078f 100644 --- a/dev/scripts/lint-shell-scripts.sh +++ b/dev/scripts/lint-shell-scripts.sh @@ -1,33 +1,39 @@ #!/bin/bash # Import OpenSlides utils package -. $( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/util.sh +. "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/util.sh" export SINGLE_TARGET=$1 lint_all_files() { # Finds all files with a valid shebang at the beginning. Grep outputs the filename as well as the shebang itself. # The shebang is cut out so that only the filename remains. This filename is then used as an input parameter for shellcheck - find . -type f -exec grep -EH '^#!(.*/|.*env +)(sh|bash|ksh)' {} \; | cut -d: -f1 | xargs shellcheck - info $? + find . -type f -exec grep -EH '^#!(.*/|.*env +)(sh|bash|ksh)' {} \; | cut -d: -f1 | xargs shellcheck -x } -# This uses Shellcheck (https://github.com/koalaman/shellcheck) to lint all Service Dockerfiles +# This uses Shellcheck (https://github.com/koalaman/shellcheck) to lint all Service shell-scripts as well as the dev folder # Call Shellcheck on each Submodule shell-scripts LOCAL_PWD=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +# info " Linting shell-scripts for dev:" && \ +# lint_all_files "${LOCAL_PWD}"/.. + IFS=$'\n' for DIR in $(git submodule foreach --recursive -q sh -c pwd); do # Extract submodule name - cd "$DIR" && \ - export DIRNAME=${PWD##*/} && \ - export SUBMODULE=${DIRNAME//"openslides-"} && \ - if [ $SUBMODULE == 'meta' ]; then continue; fi && \ - if [ $SUBMODULE == 'go' ]; then continue; fi && \ + cd "$DIR" || exit && \ + + DIRNAME=${PWD##*/} && \ + export DIRNAME && \ + SUBMODULE=${DIRNAME//"openslides-"} && \ + export SUBMODULE && \ + + if [ "$SUBMODULE" == 'go' ]; then continue; fi && \ + if [ "$SUBMODULE" == 'meta' ]; then continue; fi && \ # Check for single target - if [ $# -eq 1 ]; then if [[ $SINGLE_TARGET != $SUBMODULE ]]; then continue; fi; fi && \ + if [ $# -eq 1 ]; then if [[ "$SINGLE_TARGET" != "$SUBMODULE" ]]; then continue; fi; fi && \ # Execute test info " Linting shell-scripts for ${SUBMODULE}:" && \ diff --git a/dev/scripts/makefile/build-all-submodules.sh b/dev/scripts/makefile/build-all-submodules.sh index eba144e9cd..8b461bcb6e 100755 --- a/dev/scripts/makefile/build-all-submodules.sh +++ b/dev/scripts/makefile/build-all-submodules.sh @@ -1,7 +1,7 @@ #!/bin/bash # Import OpenSlides utils package -. $( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/../util.sh +. "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/../util.sh" # Iterates all submodules and executes the make-target 'build-aio' using parameter context as build target # Ignores meta directory @@ -13,7 +13,7 @@ export CONTEXT=$1 -if [ "${CONTEXT}" != "prod" -a "${CONTEXT}" != "dev" -a "${CONTEXT}" != "tests" ]; then +if [ "${CONTEXT}" != "prod" ] && [ "${CONTEXT}" != "dev" ] && [ "${CONTEXT}" != "tests" ]; then warn "No build context specified. Building for prod per default." >&2 export CONTEXT="prod" fi @@ -22,13 +22,18 @@ export SINGLE_TARGET=$2 IFS=$'\n' for DIR in $(git submodule foreach --recursive -q sh -c pwd); do - # Extract submodule name - cd "$DIR" && \ - export DIRNAME=${PWD##*/} && \ - export SUBMODULE=${DIRNAME//"openslides-"} && \ + # Extract submodule name + cd "$DIR" || exit && \ + DIRNAME=${PWD##*/} && \ + export DIRNAME && \ + SUBMODULE=${DIRNAME//"openslides-"} && \ + export SUBMODULE && \ + + if [ "$SUBMODULE" == 'meta' ]; then continue; fi && \ + # Check for single target - if [ $# -eq 2 ]; then if [[ $SINGLE_TARGET != $SUBMODULE ]]; then continue; fi; fi && \ + if [ $# -eq 2 ]; then if [[ "$SINGLE_TARGET" != "$SUBMODULE" ]]; then continue; fi; fi && \ # Execute test info " --- Building service ${SUBMODULE} for context ${CONTEXT} --- " && \ diff --git a/dev/scripts/makefile/build-service.sh b/dev/scripts/makefile/build-service.sh index da190dfccc..162e2084ac 100644 --- a/dev/scripts/makefile/build-service.sh +++ b/dev/scripts/makefile/build-service.sh @@ -1,7 +1,7 @@ #!/bin/bash # Import OpenSlides utils package -. $( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/../util.sh +. "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/../util.sh" # Builds a single Submodule Service. This expects to be in the directory/subdirectory of the respective service @@ -15,7 +15,7 @@ if [ -z "${SERVICE}" ]; then exit 1 fi -if [ "${CONTEXT}" != "prod" -a "${CONTEXT}" != "dev" -a "${CONTEXT}" != "tests" ] ; then \ +if [ "${CONTEXT}" != "prod" ] && [ "${CONTEXT}" != "dev" ] && [ "${CONTEXT}" != "tests" ] ; then \ error "Please provide a context for this build (bash build-service.sh , possible options: prod, dev, tests)"; \ exit 1; \ fi @@ -32,4 +32,4 @@ if [ "${CONTEXT}" != "prod" ]; then export TAG="${TAG}-${CONTEXT}"; fi info "Building submodule '${SERVICE}' for ${CONTEXT} context" -echocmd docker build -f ./Dockerfile ./ --tag ${TAG} --build-arg CONTEXT=${CONTEXT} --target ${CONTEXT} ${OPT_ARGS} +echocmd docker build -f ./Dockerfile ./ --tag "${TAG}" --build-arg CONTEXT="${CONTEXT}" --target "${CONTEXT}" "${OPT_ARGS}" diff --git a/dev/scripts/makefile/test-all-submodules.sh b/dev/scripts/makefile/test-all-submodules.sh index 10e0de80a2..fdb71e5835 100644 --- a/dev/scripts/makefile/test-all-submodules.sh +++ b/dev/scripts/makefile/test-all-submodules.sh @@ -1,7 +1,7 @@ #!/bin/bash # Import OpenSlides utils package -. $( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/../util.sh +. "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/../util.sh" # Iterates all submodules and executes the make-target 'run-tests' # Ignores meta directory @@ -18,13 +18,17 @@ declare -A outputs IFS=$'\n' for DIR in $(git submodule foreach --recursive -q sh -c pwd); do # Extract submodule name - cd "$DIR" && \ - export DIRNAME=${PWD##*/} && \ - export SUBMODULE=${DIRNAME//"openslides-"} && \ - if [ $SUBMODULE == 'meta' ]; then continue; fi && \ + cd "$DIR" || exit && \ + + DIRNAME=${PWD##*/} && \ + export DIRNAME && \ + SUBMODULE=${DIRNAME//"openslides-"} && \ + export SUBMODULE && \ + + if [ "$SUBMODULE" == 'meta' ]; then continue; fi && \ # Check for single target - if [ $# -eq 1 ]; then if [[ $SINGLE_TARGET != $SUBMODULE ]]; then continue; fi; fi && \ + if [ $# -eq 1 ]; then if [[ "$SINGLE_TARGET" != "$SUBMODULE" ]]; then continue; fi; fi && \ # Execute test info "Testing service ${SUBMODULE}" && \ @@ -34,9 +38,10 @@ for DIR in $(git submodule foreach --recursive -q sh -c pwd); do done for x in "${!outputs[@]}"; do - export VALUE=${outputs[${x}]} && \ - if [ $VALUE != '0' ]; then error "Tests for service ${x} failed"; fi && \ - if [ $VALUE == '0' ]; then success "Tests for service ${x} successful"; fi + VALUE=${outputs[${x}]} + export VALUE && \ + if [ "$VALUE" != '0' ]; then error "Tests for service ${x} failed"; fi && \ + if [ "$VALUE" == '0' ]; then success "Tests for service ${x} successful"; fi done wait \ No newline at end of file diff --git a/openslides-auth-service b/openslides-auth-service index fb97f110cb..50c64488d0 160000 --- a/openslides-auth-service +++ b/openslides-auth-service @@ -1 +1 @@ -Subproject commit fb97f110cbb235e0c1adc7c13f531344639875f5 +Subproject commit 50c64488d04a0891d80d392354ba99ed45e8f98e diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service index 3706631349..0375b1ede3 160000 --- a/openslides-autoupdate-service +++ b/openslides-autoupdate-service @@ -1 +1 @@ -Subproject commit 370663134998b19ef83bd3eb6f8c3b94869b99f7 +Subproject commit 0375b1ede3c02a5039802f97fab2add9c7184394 diff --git a/openslides-backend b/openslides-backend index b8808d0682..3994da2d9a 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit b8808d0682721b69c7d6890f167c3eec1b583474 +Subproject commit 3994da2d9a5c2f8b4e6cd19d5799f6d93cc09393 diff --git a/openslides-client b/openslides-client index 553e4ab554..0b7c4b301a 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit 553e4ab55407e0840cdebc036bcf491b87bcd504 +Subproject commit 0b7c4b301afffa9a44cc8f5e6b457fc012582a8b diff --git a/openslides-datastore-service b/openslides-datastore-service index 5b14f9f8ef..48960c0c8b 160000 --- a/openslides-datastore-service +++ b/openslides-datastore-service @@ -1 +1 @@ -Subproject commit 5b14f9f8ef1da598b53275f790d9b935d4ce18ad +Subproject commit 48960c0c8b9cec73641fedbe13094011387bfe05 diff --git a/openslides-manage-service b/openslides-manage-service index f8c00a339c..a4921446c3 160000 --- a/openslides-manage-service +++ b/openslides-manage-service @@ -1 +1 @@ -Subproject commit f8c00a339ccd3c54cca7b0f467ce3f9b784b4815 +Subproject commit a4921446c3bdce19f9564f19bb6d9aa14137be18 diff --git a/openslides-media-service b/openslides-media-service index c54c2e83a2..205e4f7af6 160000 --- a/openslides-media-service +++ b/openslides-media-service @@ -1 +1 @@ -Subproject commit c54c2e83a2988ad6d7ea66d360cb57a580e99809 +Subproject commit 205e4f7af67fca63362cc2e11155667e0a442a27 diff --git a/openslides-search-service b/openslides-search-service index 432dbe700b..02efb76806 160000 --- a/openslides-search-service +++ b/openslides-search-service @@ -1 +1 @@ -Subproject commit 432dbe700b8fb9654da250be413b618abfa22ae7 +Subproject commit 02efb76806c9e2f1861a2d47f250359b29dc2360 diff --git a/openslides-vote-service b/openslides-vote-service index 1566392c4a..0605a17028 160000 --- a/openslides-vote-service +++ b/openslides-vote-service @@ -1 +1 @@ -Subproject commit 1566392c4a1c1076b4000d49593860d9def0110f +Subproject commit 0605a170287586ab13354c5afdfa4b5fdcc2cc1f From d26552fe858027d303c00add4740819a97b3310b Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Mon, 23 Jun 2025 16:21:57 +0200 Subject: [PATCH 46/49] More linting fixes --- dev/actions/build-service/action-run.sh | 4 ++-- dev/scripts/lint-shell-scripts.sh | 12 ++++++----- dev/scripts/makefile/build-all-submodules.sh | 2 +- dev/scripts/makefile/test-all-submodules.sh | 2 +- dev/scripts/util.sh | 21 +++++++++++--------- 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dev/actions/build-service/action-run.sh b/dev/actions/build-service/action-run.sh index acbc8a84bd..d40b95b911 100644 --- a/dev/actions/build-service/action-run.sh +++ b/dev/actions/build-service/action-run.sh @@ -1,4 +1,4 @@ #!/bin/bash -chmod +x ${GITHUB_ACTION_PATH}/../../scripts/makefile/build-service.sh -${GITHUB_ACTION_PATH}/../../scripts/makefile/build-service.sh ${SERVICE} ${CONTEXT} ${MODULE} ${PORT} \ No newline at end of file +chmod +x "${GITHUB_ACTION_PATH}"/../../scripts/makefile/build-service.sh +"${GITHUB_ACTION_PATH}"/../../scripts/makefile/build-service.sh "${SERVICE}" "${CONTEXT}" "${MODULE}" "${PORT}" \ No newline at end of file diff --git a/dev/scripts/lint-shell-scripts.sh b/dev/scripts/lint-shell-scripts.sh index 6a6462078f..2a4742a3bb 100644 --- a/dev/scripts/lint-shell-scripts.sh +++ b/dev/scripts/lint-shell-scripts.sh @@ -8,16 +8,18 @@ export SINGLE_TARGET=$1 lint_all_files() { # Finds all files with a valid shebang at the beginning. Grep outputs the filename as well as the shebang itself. # The shebang is cut out so that only the filename remains. This filename is then used as an input parameter for shellcheck - find . -type f -exec grep -EH '^#!(.*/|.*env +)(sh|bash|ksh)' {} \; | cut -d: -f1 | xargs shellcheck -x + find . -type f -exec grep -EH '^#!(.*/|.*env +)(sh|bash|ksh)' {} \; | cut -d: -f1 | xargs shellcheck } # This uses Shellcheck (https://github.com/koalaman/shellcheck) to lint all Service shell-scripts as well as the dev folder # Call Shellcheck on each Submodule shell-scripts -LOCAL_PWD=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) - -# info " Linting shell-scripts for dev:" && \ -# lint_all_files "${LOCAL_PWD}"/.. +( + LOCAL_PWD=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + cd "$LOCAL_PWD"/.. || exit + info " Linting shell-scripts for dev:" && \ + lint_all_files +) IFS=$'\n' for DIR in $(git submodule foreach --recursive -q sh -c pwd); do diff --git a/dev/scripts/makefile/build-all-submodules.sh b/dev/scripts/makefile/build-all-submodules.sh index 8b461bcb6e..94d55d4d5b 100755 --- a/dev/scripts/makefile/build-all-submodules.sh +++ b/dev/scripts/makefile/build-all-submodules.sh @@ -37,6 +37,6 @@ for DIR in $(git submodule foreach --recursive -q sh -c pwd); do # Execute test info " --- Building service ${SUBMODULE} for context ${CONTEXT} --- " && \ - echocmd eval "make build-${CONTEXT}" + echocmd make build-"${CONTEXT}" done wait \ No newline at end of file diff --git a/dev/scripts/makefile/test-all-submodules.sh b/dev/scripts/makefile/test-all-submodules.sh index fdb71e5835..4f07dae7da 100644 --- a/dev/scripts/makefile/test-all-submodules.sh +++ b/dev/scripts/makefile/test-all-submodules.sh @@ -33,7 +33,7 @@ for DIR in $(git submodule foreach --recursive -q sh -c pwd); do # Execute test info "Testing service ${SUBMODULE}" && \ export ERROR_FOUND="" &&\ - echocmd make "run-tests" || export ERROR_FOUND="1" && \ + echocmd make run-tests || export ERROR_FOUND="1" && \ outputs[$SUBMODULE]="${?}${ERROR_FOUND}" done diff --git a/dev/scripts/util.sh b/dev/scripts/util.sh index 7bfdb407a4..f844dd61ff 100644 --- a/dev/scripts/util.sh +++ b/dev/scripts/util.sh @@ -29,7 +29,7 @@ ask() { reply_opt="[Y/n]"; blank="" } - read -rp "$@ $reply_opt: " + read -rp "$* $reply_opt: " case "$REPLY" in Y|y|Yes|yes|YES|"$blank") return 0 ;; *) return 1 ;; @@ -41,21 +41,24 @@ ask() { # This allows callers of echocmd to still handle their provided command's stdout # as if executed directly. echocmd() { - echo "${COL_BLUE}$ $@${COL_NORMAL}" >&2 - "$@" + ( + IFS=$' ' + echo "${COL_BLUE}$ $*${COL_NORMAL}" >&2 + $* return $? + ) } info() { - echo "${COL_GRAY}$@${COL_NORMAL}" + echo "${COL_GRAY}$*${COL_NORMAL}" } warn() { - echo "${COL_YELLOW}[WARN] ${COL_GRAY}$@${COL_NORMAL}" >&2 + echo "${COL_YELLOW}[WARN] ${COL_GRAY}$*${COL_NORMAL}" >&2 } error() { - echo "${COL_RED}[ERROR] ${COL_GRAY}$@${COL_NORMAL}" >&2 + echo "${COL_RED}[ERROR] ${COL_GRAY}$*${COL_NORMAL}" >&2 } abort() { @@ -64,14 +67,14 @@ abort() { } success() { - echo "${COL_GREEN}$@${COL_NORMAL}" + echo "${COL_GREEN}$*${COL_NORMAL}" } fancy() { echo "" echo " -*~=$§{}§$=~*-" echo "" - echo " $@" + echo " $*" echo "" echo " -*~=$§{}§$=~*-" echo "" @@ -81,7 +84,7 @@ shout() { echo "" echo "${COL_CYAN}========================================================${COL_NORMAL}" echo "" - echo "${COL_CYAN}$@${COL_NORMAL}" + echo "${COL_CYAN}$*${COL_NORMAL}" echo "" echo "${COL_CYAN}========================================================${COL_NORMAL}" echo "" From 2050f1db1f5545cde26b612b4c3b10c2dd262c71 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Tue, 24 Jun 2025 08:10:38 +0200 Subject: [PATCH 47/49] Bump --- openslides-autoupdate-service | 2 +- openslides-client | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service index 0375b1ede3..8715763719 160000 --- a/openslides-autoupdate-service +++ b/openslides-autoupdate-service @@ -1 +1 @@ -Subproject commit 0375b1ede3c02a5039802f97fab2add9c7184394 +Subproject commit 8715763719611a08cef55d8bd562a77368f04fc7 diff --git a/openslides-client b/openslides-client index 0b7c4b301a..c3057e5214 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit 0b7c4b301afffa9a44cc8f5e6b457fc012582a8b +Subproject commit c3057e521441afe72ce0d2bb25745619d63fa525 From 51ea225ef3e93ca945892f174b0cfcb43df71366 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Tue, 24 Jun 2025 10:14:20 +0200 Subject: [PATCH 48/49] Spellcheck linting --- dev/docker/build.sh | 27 ++++--- dev/scripts/co-branch.sh | 22 +++--- dev/scripts/db.sh | 2 +- dev/scripts/dc-dev.sh | 4 +- dev/scripts/export-ds.sh | 2 +- dev/scripts/extract-translations.sh | 4 +- dev/scripts/lint-shell-scripts.sh | 4 +- dev/scripts/loc.sh | 12 ++-- dev/scripts/make-update.sh | 105 ++++++++++------------------ dev/scripts/reset-db-import-sql.sh | 4 +- dev/scripts/set-ds.sh | 2 +- dev/scripts/submodules-do.sh | 8 +-- dev/scripts/util.sh | 2 +- 13 files changed, 82 insertions(+), 116 deletions(-) diff --git a/dev/docker/build.sh b/dev/docker/build.sh index da804976e3..277032edfa 100755 --- a/dev/docker/build.sh +++ b/dev/docker/build.sh @@ -37,7 +37,7 @@ OPT_IMAGES= usage() { cat << EOF -Usage: $(basename ${BASH_SOURCE[0]}) [] ... +Usage: $(basename "${BASH_SOURCE[0]}") [] ... Options: -D, --docker-repo Specify a Docker repository @@ -58,8 +58,8 @@ fi shortopt="hr:D:t:" longopt="help,docker-repo:,tag:,no-cache,ask-push,yes,images" -ARGS=$(getopt -o "$shortopt" -l "$longopt" -n "$ME" -- "$@") -if [ $? -ne 0 ]; then usage; exit 1; fi +ARGS=$(getopt -o "$shortopt" -l "$longopt" -n "$ME" -- "$@") || { usage; exit 1; } + eval set -- "$ARGS"; unset ARGS @@ -75,7 +75,7 @@ while true; do shift 2 ;; --no-cache) - OPTIONS+="--no-cache" + OPTIONS+=("--no-cache") shift 1 ;; --ask-push) @@ -96,9 +96,8 @@ while true; do esac done -SELECTED_TARGETS=($@) -[[ "${#SELECTED_TARGETS[@]}" -ge 1 ]] || SELECTED_TARGETS=("${DEFAULT_TARGETS[@]}") -[[ "${SELECTED_TARGETS[@]}" != "all" ]] || SELECTED_TARGETS=("${!TARGETS[@]}") +SELECTED_TARGETS=("$@") +if [ "$#" == 0 ]; then SELECTED_TARGETS=("${DEFAULT_TARGETS[@]}"); elif [ "$*" = "all" ]; then SELECTED_TARGETS=("${!TARGETS[@]}"); fi OPTIONS+=(--build-arg "VERSION=$DOCKER_TAG") @@ -122,7 +121,7 @@ for i in "${SELECTED_TARGETS[@]}"; do fi echo "Building $img..." - cd $loc + cd "$loc" || exit 1 { printf '{\n' printf '\t"service": "%s,\n' "${i}" @@ -152,7 +151,7 @@ if [[ "${#BUILT_IMAGES[@]}" -ge 1 ]]; then printf "\nSuccessfully built images:\n\n" for i in "${BUILT_IMAGES[@]}"; do read -r img x <<< "$i" - printf " - $img\n" + printf " - %s\n" "$img" done else echo "No images were built." @@ -161,14 +160,14 @@ fi [[ -n "$ASK_PUSH" ]] || exit 0 -if [ -n $OPT_YES ] || ! hash whiptail > /dev/null 2>&1; then +if [ -n "$OPT_YES" ] || ! hash whiptail > /dev/null 2>&1; then echo for i in "${BUILT_IMAGES[@]}"; do read -r img x <<< "$i" - if [ -n $OPT_YES ]; then + if [ -n "$OPT_YES" ]; then REPL=y else - read -p "Push image '$img' to repository? [Y/n] " REPL + read -r -p "Push image '$img' to repository? [Y/n] " REPL fi case "$REPL" in N|n|No|no|NO) exit 0;; @@ -176,12 +175,12 @@ if [ -n $OPT_YES ] || ! hash whiptail > /dev/null 2>&1; then esac done else - while read img; do + while read -r img; do echo "Pushing ${img}." docker push "$img" done < <( whiptail --title "OpenSlides build script" \ --checklist "Select images to push to their registry." \ 25 78 16 --separate-output --noitem --clear \ - ${BUILT_IMAGES[@]} \ + "${BUILT_IMAGES[@]}" \ 3>&2 2>&1 1>&3 ) fi diff --git a/dev/scripts/co-branch.sh b/dev/scripts/co-branch.sh index 7d2a07d74c..80d636b07f 100755 --- a/dev/scripts/co-branch.sh +++ b/dev/scripts/co-branch.sh @@ -24,7 +24,7 @@ set_remote() { } verify_branch() { - git fetch $REMOTE_NAME + git fetch "$REMOTE_NAME" git rev-parse --verify remotes/"$REMOTE_NAME"/"$BRANCH_NAME" &>/dev/null || BRANCH_NAME=main } @@ -35,8 +35,8 @@ pull_latest_commit() { git checkout "$REMOTE_NAME/$BRANCH_NAME" else echo "git checkout $BRANCH_NAME && git pull --ff-only $REMOTE_NAME $BRANCH_NAME ..." - git checkout "$BRANCH_NAME" && - git pull --ff-only "$REMOTE_NAME" "$BRANCH_NAME" || { + { git checkout "$BRANCH_NAME" && + git pull --ff-only "$REMOTE_NAME" "$BRANCH_NAME"; } || { echo "ERROR: make sure a local branch $BRANCH_NAME exists and can be fast-forwarded to $REMOTE_NAME" exit 1 } @@ -46,10 +46,10 @@ pull_latest_commit() { run_switch () { # First check for changes and stash them if wanted. echo "Check for changes..." - if [[ `git status --porcelain --ignore-submodules --untracked-files=no` ]]; then + if [[ $(git status --porcelain --ignore-submodules --untracked-files=no) ]]; then echo "The repository $mod has changes. Stash them? [y/n]" - read decision - if [ $decision == "y" ]; then + read -r decision + if [ "$decision" == "y" ]; then git stash else exit 0 @@ -59,10 +59,10 @@ run_switch () { ( echo "Check for changes..." cd "$mod" - if [[ `git status --porcelain` ]]; then + if [[ $(git status --porcelain) ]]; then echo "The repository $mod has changes. Stash them? [y/n]" - read decision - if [ $decision == "y" ]; then + read -r decision + if [ "$decision" == "y" ]; then git stash else exit 0 @@ -88,8 +88,8 @@ if [ $# -eq 0 ]; then usage echo "" echo "Do you want to want to proceed with branch main in remote ${REMOTE_NAME}? [y/n]" - read sw - if [ $sw == "y" ]; then + read -r sw + if [ "$sw" == "y" ]; then run_switch fi exit 0 diff --git a/dev/scripts/db.sh b/dev/scripts/db.sh index d81320ebff..fa233c91b0 100755 --- a/dev/scripts/db.sh +++ b/dev/scripts/db.sh @@ -1,3 +1,3 @@ #!/bin/bash -cd "$(dirname $0)" +cd "$(dirname "$0")" || exit 1 docker compose -f ../docker/docker-compose.dev.yml exec datastore-writer psql postgresql://openslides:openslides@postgres/openslides diff --git a/dev/scripts/dc-dev.sh b/dev/scripts/dc-dev.sh index 730a3397f9..30ec131795 100755 --- a/dev/scripts/dc-dev.sh +++ b/dev/scripts/dc-dev.sh @@ -1,3 +1,3 @@ #!/bin/bash -cd "$(dirname $0)" -docker compose -f ../docker/docker-compose.dev.yml $@ +cd "$(dirname "$0")" || exit 1 +docker compose -f ../docker/docker-compose.dev.yml "$@" diff --git a/dev/scripts/export-ds.sh b/dev/scripts/export-ds.sh index 9eb82d82e4..8f6eaa47a2 100755 --- a/dev/scripts/export-ds.sh +++ b/dev/scripts/export-ds.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -cd "$(dirname $0)" +cd "$(dirname "$0")" || exit 1 TARGET=${1:-export.json} docker compose -f ../docker/docker-compose.dev.yml exec -T datastore-writer python cli/export_data_only.py > "$TARGET" diff --git a/dev/scripts/extract-translations.sh b/dev/scripts/extract-translations.sh index 6ed71d96b3..b2644cf0ef 100755 --- a/dev/scripts/extract-translations.sh +++ b/dev/scripts/extract-translations.sh @@ -1,6 +1,6 @@ #!/bin/bash -cd "$(dirname $0)" +cd "$(dirname "$0")" || exit 1 # extract translations ./dc-dev.sh exec client npm run extract @@ -8,7 +8,7 @@ cd "$(dirname $0)" # merge translations echo "merging POT files..." -cd ../.. +cd ../.. || exit 1 xgettext --no-location --omit-header -o i18n/template-en.pot \ openslides-client/client/src/assets/i18n/template-en.pot \ openslides-backend/openslides_backend/i18n/messages/template-en.pot diff --git a/dev/scripts/lint-shell-scripts.sh b/dev/scripts/lint-shell-scripts.sh index 2a4742a3bb..e9c77ef0a3 100644 --- a/dev/scripts/lint-shell-scripts.sh +++ b/dev/scripts/lint-shell-scripts.sh @@ -8,13 +8,13 @@ export SINGLE_TARGET=$1 lint_all_files() { # Finds all files with a valid shebang at the beginning. Grep outputs the filename as well as the shebang itself. # The shebang is cut out so that only the filename remains. This filename is then used as an input parameter for shellcheck - find . -type f -exec grep -EH '^#!(.*/|.*env +)(sh|bash|ksh)' {} \; | cut -d: -f1 | xargs shellcheck + find . -type f -exec grep -EH '^#!(.*/|.*env +)(sh|bash|ksh)' {} \; | cut -d: -f1 | xargs shellcheck -e SC1090,SC1091 } # This uses Shellcheck (https://github.com/koalaman/shellcheck) to lint all Service shell-scripts as well as the dev folder # Call Shellcheck on each Submodule shell-scripts -( +[[ "$*" != "" ]] || ( LOCAL_PWD=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) cd "$LOCAL_PWD"/.. || exit info " Linting shell-scripts for dev:" && \ diff --git a/dev/scripts/loc.sh b/dev/scripts/loc.sh index 76c050a016..8d46af0aa5 100755 --- a/dev/scripts/loc.sh +++ b/dev/scripts/loc.sh @@ -54,18 +54,18 @@ list=$(while read -r author; do main=$(git log --since="$start_date" --numstat --pretty="%H" --author="^$author" |\ grep -v -f <(IFS=$'\n'; echo "${exclude[*]}") |\ awk 'NF==3 {plus+=$1; minus+=$2} END {printf("%d %d\n", plus, minus)}') - plus=$(( $(cut -d " " -f 1 <<< $submodules) + $(cut -d " " -f 1 <<< $main) )) - minus=$(( $(cut -d " " -f 2 <<< $submodules) + $(cut -d " " -f 2 <<< $main) )) + plus=$(( $(cut -d " " -f 1 <<< "$submodules") + $(cut -d " " -f 1 <<< "$main") )) + minus=$(( $(cut -d " " -f 2 <<< "$submodules") + $(cut -d " " -f 2 <<< "$main") )) total=$((plus + minus)) echo " $total | $author | $plus | $minus" -done <<< $(git submodule foreach --quiet git log --format='%aN' --since="$start_date" \ - | sort -u | sed 's/\[bot\]//g')) +done <<< "$(git submodule foreach --quiet git log --format='%aN' --since="$start_date" \ + | sort -u | sed 's/\[bot\]//g')") # For authors who have several names... for m in "${merge_list[@]}"; do - list=$(merge_authors "$(cut -d ":" -f 1 <<< $m)" "$(cut -d ":" -f 2 <<< $m )") + list=$(merge_authors "$(cut -d ":" -f 1 <<< "$m")" "$(cut -d ":" -f 2 <<< "$m" )") done echo "All changed lines per author since $start_date:" -printf "$list\n" | sort -nr | column --table-columns " TOTAL, AUTHOR, PLUS, MINUS" \ +printf "%s\n" "$list" | sort -nr | column --table-columns " TOTAL, AUTHOR, PLUS, MINUS" \ --table-order " AUTHOR, TOTAL, PLUS, MINUS" -ts '|' -o '|' diff --git a/dev/scripts/make-update.sh b/dev/scripts/make-update.sh index 3034679426..f21a29eb2f 100755 --- a/dev/scripts/make-update.sh +++ b/dev/scripts/make-update.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Import OpenSlides utils package +. "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/../util.sh" + set -ae ME=$(basename "$0") @@ -71,46 +74,6 @@ MODES: EOF } -ask() { - local default_reply="$1" reply_opt="[y/N]" blank="y" REPLY= - shift; [[ "$default_reply" != y ]] || { - reply_opt="[Y/n]"; blank="" - } - - read -rp "$@ $reply_opt: " - case "$REPLY" in - Y|y|Yes|yes|YES|"$blank") return 0 ;; - *) return 1 ;; - esac -} - -# echocmd first echos args in blue on stderr. Then args are treated like a -# provided command and executed. -# This allows callers of echocmd to still handle their provided command's stdout -# as if executed directly. -echocmd() { - echo "${COL_BLUE}$ $@${COL_NORMAL}" >&2 - "$@" - return $? -} - -info() { - echo "${COL_GRAY}$@${COL_NORMAL}" -} - -warn() { - echo "${COL_YELLOW}[WARN] ${COL_GRAY}$@${COL_NORMAL}" >&2 -} - -error() { - echo "${COL_RED}[ERROR] ${COL_GRAY}$@${COL_NORMAL}" >&2 -} - -abort() { - echo "Aborting." - exit "$1" -} - set_remote() { REMOTE_NAME=upstream git ls-remote --exit-code "$REMOTE_NAME" &>/dev/null || @@ -123,7 +86,7 @@ confirm_version() { echocmd git fetch "$REMOTE_NAME" "$STABLE_BRANCH_NAME" STABLE_VERSION="$(git show "$REMOTE_NAME/$STABLE_BRANCH_NAME:VERSION")" info "Guessing staging version from stable version $STABLE_VERSION found in $REMOTE_NAME." - STAGING_VERSION="$(echo $STABLE_VERSION | awk -v FS=. -v OFS=. '{$3=$3+1 ; print $0}')" # 4.N.M -> 4.N.M+1 + STAGING_VERSION="$(echo "$STABLE_VERSION" | awk -v FS=. -v OFS=. '{$3=$3+1 ; print $0}')" # 4.N.M -> 4.N.M+1 # Give the user the opportunity to adjust the calculated staging version read -rp "Please confirm the staging version to be used [${STAGING_VERSION}]: " case "$REPLY" in @@ -143,19 +106,19 @@ check_current_branch() { # If remote branch exists ensure we are up-to-date with it [[ "$(git rev-parse --abbrev-ref HEAD)" == "$BRANCH_NAME" ]] || { - warn "$BRANCH_NAME branch not checked out ($(basename $(realpath .)))" - ask y "Run \`git checkout $BRANCH_NAME && git submodule update --recursive\` now?" && - echocmd git checkout $BRANCH_NAME && echocmd git submodule update --recursive || + warn "$BRANCH_NAME branch not checked out ($(basename "$(realpath .)"))" + { ask y "Run \`git checkout $BRANCH_NAME && git submodule update --recursive\` now?" && + echocmd git checkout "$BRANCH_NAME" && echocmd git submodule update --recursive; } || abort 0 } echocmd git fetch "$REMOTE_NAME" "$BRANCH_NAME" if git merge-base --is-ancestor "$BRANCH_NAME" "$REMOTE_NAME/$BRANCH_NAME"; then - echocmd git merge --ff-only "$REMOTE_NAME"/$BRANCH_NAME + echocmd git merge --ff-only "$REMOTE_NAME"/"$BRANCH_NAME" else warn "$BRANCH_NAME and $REMOTE_NAME/$BRANCH_NAME have diverged." - ask n "Run \`git reset --hard $REMOTE_NAME/$BRANCH_NAME\` now?" && - echocmd git reset --hard "$REMOTE_NAME/$BRANCH_NAME" || + { ask n "Run \`git reset --hard $REMOTE_NAME/$BRANCH_NAME\` now?" && + echocmd git reset --hard "$REMOTE_NAME/$BRANCH_NAME"; } || abort 0 fi } @@ -181,7 +144,7 @@ check_ssh_remotes() { { $remote_cmd - git submodule foreach --quiet --recursive $remote_cmd + git submodule foreach --quiet --recursive "$remote_cmd" } | awk '/^https?:\/\// {print " " $1; x=1} END {exit x}' || { warn "The above $REMOTE_NAME remotes seem not to use ssh." warn "$ME will attempt to directly push to these." @@ -269,8 +232,8 @@ check_meta_consistency() { # Doing a nested loop rather than foreach --recursive as it's easier to get # both the path of service submod and the (potential) meta submod in one # iteration - while read mod; do - while read meta_name meta_path; do + while read -r mod; do + while read -r meta_name meta_path; do [[ "$meta_name" == 'openslides-meta' ]] || continue @@ -288,7 +251,7 @@ check_meta_consistency() { [[ -z "$meta_sha_last" ]] || [[ "$meta_sha" == "$meta_sha_last" ]] || ret_code=1 meta_sha_last="$meta_sha" - done <<< "$(git -C $mod submodule foreach -q 'echo "$name $sm_path"')" + done <<< "$(git -C "$mod" submodule foreach -q 'echo "$name $sm_path"')" done <<< "$(git submodule foreach -q 'echo "$sm_path"')" return $ret_code @@ -306,7 +269,7 @@ check_go_consistency() { target_rev_at_str="(at $target_rev) " info "Checking openslides-go consistency $target_rev_at_str..." - while read mod_name mod_path; do + while read -r mod_name mod_path; do grep -q openslides-go "$mod_path/go.mod" 2>/dev/null || continue @@ -353,7 +316,11 @@ add_changes() { for mod in $(git submodule status | awk '$1 ~ "^\+" {print $2}'); do ( set_remote - local target_sha= mod_sha_old= mod_sha_new= log_cmd= merge_base= + local target_sha="" + local mod_sha_old="" + local mod_sha_new="" + local log_cmd="" + local merge_base="" mod_sha_old="$(git diff --submodule=short "$mod" | awk '$1 ~ "^-Subproject" { print $3 }')" mod_sha_new="$(git diff --submodule=short "$mod" | awk '$1 ~ "^\+Subproject" { print $3 }')" log_cmd="git -C $mod log --oneline --no-decorate $mod_sha_old..$mod_sha_new" @@ -398,7 +365,7 @@ choose_changes() { add_changes - check_meta_consistency && check_go_consistency || { + { check_meta_consistency && check_go_consistency; } || { warn "openslides-meta AND openslides-go have to be consistent across services." warn "Please rectify and rerun $ME" abort 1 @@ -414,7 +381,7 @@ commit_staged_changes() { [[ "$BRANCH_NAME" == stable/* ]] && commit_message="Update $(cat VERSION) ($(date +%Y%m%d))" [[ $# == 0 ]] || - commit_message="$@" + commit_message="$*" ask y "Commit on branch $BRANCH_NAME now?" && { echocmd git commit --message "$commit_message" @@ -561,8 +528,8 @@ merge_stable_branch_meta() { # Doing a nested loop rather than foreach --recursive as it's easier to get # both the path of service submod and the (potential) meta submod in one # iteration - while read mod; do - while read meta_name meta_fullpath; do + while read -r mod; do + while read -r meta_name meta_fullpath; do [[ "$meta_name" == 'openslides-meta' ]] || continue @@ -577,7 +544,7 @@ merge_stable_branch_meta() { fi info "" - done <<< "$(git -C $mod submodule foreach -q 'echo "$name $toplevel/$sm_path"')" + done <<< "$(git -C "$mod" submodule foreach -q 'echo "$name $toplevel/$sm_path"')" done <<< "$(git submodule foreach -q 'echo "$sm_path"')" } @@ -615,14 +582,14 @@ merge_stable_branch_services() { # Add previously stable-merged and pushed go if grep -q openslides-go "$service_mod/go.mod" 2>/dev/null; then go_url="$(awk '$1 ~ "/openslides-go" {print $1}' "$service_mod/go.mod")" - go_sha="$(git -C lib/openslides-go rev-parse $BRANCH_NAME)" + go_sha="$(git -C lib/openslides-go rev-parse "$BRANCH_NAME")" ( info "Adding stable go for $service_mod" cd "$service_mod" - echocmd $GO get "$go_url@$go_sha" - echocmd $GO mod tidy + echocmd "$GO" get "$go_url@$go_sha" + echocmd "$GO" mod tidy ) - echocmd git -C $service_mod add go.mod go.sum + echocmd git -C "$service_mod" add go.mod go.sum fi # Commit it all @@ -672,8 +639,8 @@ make_stable_update() { ask y "Including these staging updates for the new stable update. Continue?" || abort 0 - check_meta_consistency "$REMOTE_NAME/$STAGING_BRANCH_NAME" && - check_go_consistency "$REMOTE_NAME/$STAGING_BRANCH_NAME" || { + { check_meta_consistency "$REMOTE_NAME/$STAGING_BRANCH_NAME" && + check_go_consistency "$REMOTE_NAME/$STAGING_BRANCH_NAME"; } || { error "openslides-meta OR openslides-go is not consistent at $target_sha." error "This is not acceptable for a stable update." error "Please fix this in a new staging update before trying again." @@ -689,7 +656,7 @@ make_stable_update() { merge_stable_branch commit_staged_changes - check_meta_consistency && check_go_consistency || { + { check_meta_consistency && check_go_consistency; } || { error "Apparently merging $BRANCH_NAME went wrong and eit openslides-meta OR" error "openslides-go is not consistent anymore." error "You probably need to investigate what did go wrong." @@ -701,8 +668,8 @@ make_stable_update() { } staging_log() { - echocmd git fetch -q $REMOTE_NAME $STAGING_BRANCH_NAME - git log --graph --oneline -U0 --submodule $REMOTE_NAME/$STABLE_BRANCH_NAME..$REMOTE_NAME/$STAGING_BRANCH_NAME | \ + echocmd git fetch -q "$REMOTE_NAME" "$STAGING_BRANCH_NAME" + git log --graph --oneline -U0 --submodule "$REMOTE_NAME"/"$STABLE_BRANCH_NAME".."$REMOTE_NAME"/"$STAGING_BRANCH_NAME" | \ awk -v version="$STAGING_VERSION" ' /^\*.*Staging update [0-9]{8}/ { printf("\n# %s-staging-%s-%s\n", version, $NF, substr($2, 0, 7)) } /^\*/ { printf(" %s\n",$0) } @@ -718,14 +685,14 @@ command -v awk > /dev/null || { error "'awk' not installed!" exit 1 } -command -v $GO > /dev/null || { +command -v "$GO" > /dev/null || { error "'$GO' not installed!" exit 1 } shortopt='phl' longopt='pull,help,local' -ARGS=$(getopt -o "$shortopt" -l "$longopt" -n "$ME" -- $@) +ARGS=$(getopt -o "$shortopt" -l "$longopt" -n "$ME" -- "$@") # reset $@ to args array sorted and validated by getopt eval set -- "$ARGS" unset ARGS diff --git a/dev/scripts/reset-db-import-sql.sh b/dev/scripts/reset-db-import-sql.sh index 1684cf3860..8671aa892a 100755 --- a/dev/scripts/reset-db-import-sql.sh +++ b/dev/scripts/reset-db-import-sql.sh @@ -2,10 +2,10 @@ set -e -DC="$(dirname $0)/dc-dev.sh" +DC="$(dirname "$0")/dc-dev.sh" FILE="$1" -[ -n "$FILE" -a -r "$FILE" ] || { +{ [ -n "$FILE" ] && [ -r "$FILE" ]; } || { echo "ERROR: cannot read file $FILE" exit 1 } diff --git a/dev/scripts/set-ds.sh b/dev/scripts/set-ds.sh index e08f0c9230..282aa1904c 100755 --- a/dev/scripts/set-ds.sh +++ b/dev/scripts/set-ds.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -cd "$(dirname $0)" +cd "$(dirname "$0")" DATA=${1:-../../openslides-backend/data/example-data.json} docker compose -f ../docker/docker-compose.dev.yml exec -T datastore-writer python cli/import_data_only.py < "$DATA" diff --git a/dev/scripts/submodules-do.sh b/dev/scripts/submodules-do.sh index c940c5182f..1c6772d6ec 100755 --- a/dev/scripts/submodules-do.sh +++ b/dev/scripts/submodules-do.sh @@ -7,17 +7,17 @@ if [ -z "$1" ]; then exit 1 fi -COMMAND="$@" +COMMAND="$*" IFS=$'\n' for DIR in $(git submodule foreach --recursive -q sh -c pwd); do - printf "\n\"${DIR}\": \"${COMMAND}\" started!\n" \ + printf "\n\"%s\": \"%s\" started!\n" "${DIR}" "${COMMAND}"\ && \ - cd "$DIR" \ + cd "$DIR" || exit 1 \ && \ eval "$COMMAND" \ && \ - printf "\"${DIR}\": \"${COMMAND}\" finished!\n" \ + printf "\"%s\": \"%s\" finished!\n" "${DIR}" "${COMMAND}" \ & done wait \ No newline at end of file diff --git a/dev/scripts/util.sh b/dev/scripts/util.sh index f844dd61ff..142f13e87c 100644 --- a/dev/scripts/util.sh +++ b/dev/scripts/util.sh @@ -44,7 +44,7 @@ echocmd() { ( IFS=$' ' echo "${COL_BLUE}$ $*${COL_NORMAL}" >&2 - $* + eval "$*" return $? ) } From 81443a5ec680d7508127f380f3d439e7c055b196 Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Tue, 24 Jun 2025 13:46:36 +0200 Subject: [PATCH 49/49] Spellchecks --- dev/scripts/util.sh | 3 ++- openslides-auth-service | 2 +- openslides-autoupdate-service | 2 +- openslides-backend | 2 +- openslides-client | 2 +- openslides-datastore-service | 2 +- openslides-manage-service | 2 +- openslides-media-service | 2 +- openslides-proxy | 2 +- openslides-search-service | 2 +- openslides-vote-service | 2 +- 11 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dev/scripts/util.sh b/dev/scripts/util.sh index 142f13e87c..08be4e1991 100644 --- a/dev/scripts/util.sh +++ b/dev/scripts/util.sh @@ -44,7 +44,8 @@ echocmd() { ( IFS=$' ' echo "${COL_BLUE}$ $*${COL_NORMAL}" >&2 - eval "$*" + local command="$*" + eval "$command" return $? ) } diff --git a/openslides-auth-service b/openslides-auth-service index 50c64488d0..749bb02e61 160000 --- a/openslides-auth-service +++ b/openslides-auth-service @@ -1 +1 @@ -Subproject commit 50c64488d04a0891d80d392354ba99ed45e8f98e +Subproject commit 749bb02e61a2394949be2d256a6072a661357a2e diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service index 8715763719..4435667d88 160000 --- a/openslides-autoupdate-service +++ b/openslides-autoupdate-service @@ -1 +1 @@ -Subproject commit 8715763719611a08cef55d8bd562a77368f04fc7 +Subproject commit 4435667d88b69435ee850fa531a79cce81c428e5 diff --git a/openslides-backend b/openslides-backend index 3994da2d9a..c5366078d3 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit 3994da2d9a5c2f8b4e6cd19d5799f6d93cc09393 +Subproject commit c5366078d37b1a6465951ff6d089e0011fef5e6a diff --git a/openslides-client b/openslides-client index c3057e5214..d42d589604 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit c3057e521441afe72ce0d2bb25745619d63fa525 +Subproject commit d42d589604b738133af198e51c4cf4dbc96276aa diff --git a/openslides-datastore-service b/openslides-datastore-service index 48960c0c8b..a24fe577cd 160000 --- a/openslides-datastore-service +++ b/openslides-datastore-service @@ -1 +1 @@ -Subproject commit 48960c0c8b9cec73641fedbe13094011387bfe05 +Subproject commit a24fe577cd5f54d4bfe3e30869adf5852dad9bb4 diff --git a/openslides-manage-service b/openslides-manage-service index a4921446c3..81a7c74453 160000 --- a/openslides-manage-service +++ b/openslides-manage-service @@ -1 +1 @@ -Subproject commit a4921446c3bdce19f9564f19bb6d9aa14137be18 +Subproject commit 81a7c74453e451adc35ee1fe72dc77f886ff5d77 diff --git a/openslides-media-service b/openslides-media-service index 205e4f7af6..df84d58e6e 160000 --- a/openslides-media-service +++ b/openslides-media-service @@ -1 +1 @@ -Subproject commit 205e4f7af67fca63362cc2e11155667e0a442a27 +Subproject commit df84d58e6ee0fd79a3b0552913eef4e948f67a1e diff --git a/openslides-proxy b/openslides-proxy index b11de7f5ee..ec1892c31d 160000 --- a/openslides-proxy +++ b/openslides-proxy @@ -1 +1 @@ -Subproject commit b11de7f5eea559cb862f3b4f32fa6c33090a0004 +Subproject commit ec1892c31de5d14023b29f007158c1d5f7956f9f diff --git a/openslides-search-service b/openslides-search-service index 02efb76806..c0e4347747 160000 --- a/openslides-search-service +++ b/openslides-search-service @@ -1 +1 @@ -Subproject commit 02efb76806c9e2f1861a2d47f250359b29dc2360 +Subproject commit c0e434774760319e3ebcc6d6a7e9d3c83eca7f8b diff --git a/openslides-vote-service b/openslides-vote-service index 0605a17028..600e54ffad 160000 --- a/openslides-vote-service +++ b/openslides-vote-service @@ -1 +1 @@ -Subproject commit 0605a170287586ab13354c5afdfa4b5fdcc2cc1f +Subproject commit 600e54ffad40cf66bb6a15b936bff617504e68e8