ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated services (#6331)

Browse Source
This commit is contained in:
Emanuel Schütze 2022-01-14 01:32:03 +01:00 committed by GitHub
parent e3ad7d2e1f
commit 97a83af8c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides-backend

@ -1 +1 @@
Subproject commit f0fe824b8199011543732114240da11334828f3e Subproject commit 6eb0e66d1254e33056543238159b4768a55f01f4

2
openslides-client

@ -1 +1 @@
Subproject commit b578671a43244fec59e16ef129892a0765158d3d Subproject commit b17463c11c44fc6faf3623facc77d3faa0717e24

2
openslides-datastore-service

@ -1 +1 @@
Subproject commit dde477c405cb50e39490143fdb363f1b8786d707 Subproject commit 844d7b110433a5a28d10662e095a7c6a7795fb80

14
services-to-main.sh
View File

@ -1,14 +1,6 @@
# !/bin/bash # !/bin/bash
function get_upstream_branch { function get_upstream_branch {
local SUBMODULE_NAME=$0
local MEDIA_SERVICE_NAME="openslides-media-service"
# We have to treat the media-service differently to the other services
if [ "$SUBMODULE_NAME" == "$MEDIA_SERVICE_NAME" ]; then
echo "openslides4-dev"
return
fi;
local BRANCH_NAME=main local BRANCH_NAME=main
local exists=`git show-ref refs/heads/$BRANCH_NAME` local exists=`git show-ref refs/heads/$BRANCH_NAME`
if [[ -z $exists ]]; then if [[ -z $exists ]]; then
@ -47,9 +39,3 @@ git submodule foreach -q --recursive "bash -c pull_latest_commit \$name"
echo "" echo ""
echo "Successfully updated all submodules to latest commit." echo "Successfully updated all submodules to latest commit."
# Old command, if we need to checkout another branch than master or main:
# git submodule foreach -q --recursive
# '
# git checkout $(git config -f $$toplevel/.gitmodules submodule.$$name.branch || echo main);
# git pull upstream $$(git config -f $$toplevel/.gitmodules submodule.$$name.branch || echo main)
# '