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

Merge pull request #6303 from GabrielInTheWorld/new-service-to-master 

Automatically checkout the latest commit for every submodule
This commit is contained in:
Emanuel Schütze 2021-12-07 16:43:30 +01:00 committed by GitHub
parent fd3371dd0b 9809eb029c
commit 396dc75961
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 63 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -28,11 +28,7 @@ reload-proxy:
docker-compose -f docker/docker-compose.dev.yml exec -w /etc/caddy proxy caddy reload
services-to-master:
# Note: This script updates all submodules to upstream/master[1]. For setting the submodules to the linked
# commits use `git submodule update`. The `upstream` remote must be set up correctly to point to the main repo.
#
# [1] ...or main, or whatever branch the OS4 one is. See .gitmodules.
git submodule foreach -q --recursive 'git checkout $(git config -f $$toplevel/.gitmodules submodule.$$name.branch || echo master); git pull upstream $$(git config -f $$toplevel/.gitmodules submodule.$$name.branch || echo master)'
./services-to-master.sh
submodules-origin-to-upstream:
# You may only use this one time after cloning this repository.

62
services-to-master.sh Executable file
View File

@ -0,0 +1,62 @@
# !/bin/bash
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
# until its "main" branch is neither master nor main
if [ "$SUBMODULE_NAME" == "$MEDIA_SERVICE_NAME" ]; then
echo "openslides4-dev"
return
fi;
local BRANCH_NAME=master
local exists=`git show-ref refs/heads/$BRANCH_NAME`
if [[ -z $exists ]]; then
BRANCH_NAME=main
fi;
echo "$BRANCH_NAME"
}
function get_upstream_name {
{
# try
git ls-remote --exit-code upstream 2>/dev/null && echo "upstream"
} || {
# catch
echo "origin"
}
}
function pull_latest_commit {
local SUBMODULE_NAME=$0
echo "Pulling latest commit for: $SUBMODULE_NAME"
echo "$SUBMODULE_NAME: Checking which branch is the upstream branch"
local BRANCH_NAME=$(get_upstream_branch)
echo "$SUBMODULE_NAME: Upstream branch is $BRANCH_NAME"
git checkout $BRANCH_NAME;
local REMOTE_NAME=$(get_upstream_name)
git pull $REMOTE_NAME $BRANCH_NAME;
echo "$SUBMODULE_NAME: Successfully pulled latest commit"
}
export -f pull_latest_commit
export -f get_upstream_branch
export -f get_upstream_name
git submodule update --init
git submodule foreach -q --recursive "bash -c pull_latest_commit \$name"
echo "Successfully pulled latest commits for every submodule!"
# 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 master);
# git pull upstream $$(git config -f $$toplevel/.gitmodules submodule.$$name.branch || echo master)
# '