diff options
| author | Mickael Istria | 2021-12-01 13:28:19 +0000 |
|---|---|---|
| committer | Mickael Istria | 2021-12-02 20:04:59 +0000 |
| commit | ea3b3882eec4b6d52b2831732dc34451fec0d376 (patch) | |
| tree | d4192defde3703a656cf877b8a474920d72339d8 | |
| parent | 829e29af9b37f27aed38c295fc3f7b93b10b53ee (diff) | |
| download | eclipse.platform.releng.aggregator-ea3b3882eec4b6d52b2831732dc34451fec0d376.tar.gz eclipse.platform.releng.aggregator-ea3b3882eec4b6d52b2831732dc34451fec0d376.tar.xz eclipse.platform.releng.aggregator-ea3b3882eec4b6d52b2831732dc34451fec0d376.zip | |
Bug 577323 - Reference absolute path for modules
Use absolute path for modules so when aggregator moves to GitHub, it can
still reference projects.
Fix the tag process to push to Gerrit SSH repo when applicable
Change-Id: Ic524b20bcbd54c56b03b67ec1163c8397f05cf3b
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.releng.aggregator/+/188410
Reviewed-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Tested-by: Platform Bot <platform-bot@eclipse.org>
| -rw-r--r-- | .gitmodules | 48 | ||||
| -rwxr-xr-x | cje-production/mbscripts/mb110_tagBuildInputs.sh | 11 |
2 files changed, 34 insertions, 25 deletions
diff --git a/.gitmodules b/.gitmodules index 1772d268f..bdb678997 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,73 +1,73 @@ # Touched, for Bug 398016 - [CBI] How to coordinate (or not) submodules with Git and EGit [submodule "eclipse.jdt"] path = eclipse.jdt - url = ../../jdt/eclipse.jdt + url = https://git.eclipse.org/r/jdt/eclipse.jdt [submodule "eclipse.jdt.core"] path = eclipse.jdt.core - url = ../../jdt/eclipse.jdt.core + url = https://git.eclipse.org/r/jdt/eclipse.jdt.core [submodule "eclipse.jdt.core.binaries"] path = eclipse.jdt.core.binaries - url = ../../jdt/eclipse.jdt.core.binaries + url = https://git.eclipse.org/r/jdt/eclipse.jdt.core.binaries [submodule "eclipse.jdt.debug"] path = eclipse.jdt.debug - url = ../../jdt/eclipse.jdt.debug + url = https://git.eclipse.org/r/jdt/eclipse.jdt.debug [submodule "eclipse.jdt.ui"] path = eclipse.jdt.ui - url = ../../jdt/eclipse.jdt.ui + url = https://git.eclipse.org/r/jdt/eclipse.jdt.ui [submodule "eclipse.pde.build"] path = eclipse.pde.build - url = ../../pde/eclipse.pde.build + url = https://git.eclipse.org/r/pde/eclipse.pde.build [submodule "eclipse.pde.ui"] path = eclipse.pde.ui - url = ../../pde/eclipse.pde.ui + url = https://git.eclipse.org/r/pde/eclipse.pde.ui [submodule "eclipse.platform"] path = eclipse.platform - url = ../eclipse.platform + url = https://git.eclipse.org/r/platform/eclipse.platform [submodule "eclipse.platform.common"] path = eclipse.platform.common - url = ../eclipse.platform.common + url = https://git.eclipse.org/r/platform/eclipse.platform.common [submodule "eclipse.platform.debug"] path = eclipse.platform.debug - url = ../eclipse.platform.debug + url = https://git.eclipse.org/r/platform/eclipse.platform.debug [submodule "eclipse.platform.releng"] path = eclipse.platform.releng - url = ../eclipse.platform.releng.git + url = https://git.eclipse.org/r/platform/eclipse.platform.releng.git [submodule "eclipse.platform.resources"] path = eclipse.platform.resources - url = ../eclipse.platform.resources + url = https://git.eclipse.org/r/platform/eclipse.platform.resources [submodule "eclipse.platform.runtime"] path = eclipse.platform.runtime - url = ../eclipse.platform.runtime + url = https://git.eclipse.org/r/platform/eclipse.platform.runtime [submodule "eclipse.platform.swt"] path = eclipse.platform.swt - url = ../eclipse.platform.swt.git + url = https://git.eclipse.org/r/platform/eclipse.platform.swt.git [submodule "eclipse.platform.swt.binaries"] path = eclipse.platform.swt.binaries - url = ../eclipse.platform.swt.binaries.git + url = https://git.eclipse.org/r/platform/eclipse.platform.swt.binaries.git [submodule "eclipse.platform.team"] path = eclipse.platform.team - url = ../eclipse.platform.team + url = https://git.eclipse.org/r/platform/eclipse.platform.team [submodule "eclipse.platform.text"] path = eclipse.platform.text - url = ../eclipse.platform.text + url = https://git.eclipse.org/r/platform/eclipse.platform.text [submodule "eclipse.platform.ua"] path = eclipse.platform.ua - url = ../eclipse.platform.ua + url = https://git.eclipse.org/r/platform/eclipse.platform.ua [submodule "eclipse.platform.ui"] path = eclipse.platform.ui - url = ../eclipse.platform.ui + url = https://git.eclipse.org/r/platform/eclipse.platform.ui [submodule "rt.equinox.binaries"] path = rt.equinox.binaries - url = ../../equinox/rt.equinox.binaries.git + url = https://git.eclipse.org/r/equinox/rt.equinox.binaries.git [submodule "rt.equinox.bundles"] path = rt.equinox.bundles - url = ../../equinox/rt.equinox.bundles + url = https://git.eclipse.org/r/equinox/rt.equinox.bundles [submodule "rt.equinox.framework"] path = rt.equinox.framework - url = ../../equinox/rt.equinox.framework + url = https://git.eclipse.org/r/equinox/rt.equinox.framework [submodule "rt.equinox.p2"] path = rt.equinox.p2 - url = ../../equinox/rt.equinox.p2 + url = https://git.eclipse.org/r/equinox/rt.equinox.p2 [submodule "eclipse.platform.ui.tools"] path = eclipse.platform.ui.tools - url = ../eclipse.platform.ui.tools + url = https://git.eclipse.org/r/platform/eclipse.platform.ui.tools diff --git a/cje-production/mbscripts/mb110_tagBuildInputs.sh b/cje-production/mbscripts/mb110_tagBuildInputs.sh index 72db0e10d..5712b1a86 100755 --- a/cje-production/mbscripts/mb110_tagBuildInputs.sh +++ b/cje-production/mbscripts/mb110_tagBuildInputs.sh @@ -56,7 +56,16 @@ then fi fi -git submodule foreach "if grep \"^\${name}:\" ../../../streams/repositories_$PATCH_OR_BRANCH_LABEL.txt > /dev/null; then git tag $BUILD_ID; git push --verbose origin $BUILD_ID; else echo Skipping \$name; fi || :" +function toPushRepo() { + from="$1" + if ! [[ "$from" == http* ]]; then + echo $from + else + echo $(sed -e 's,http://git.eclipse.org/gitroot,ssh://genie.releng@git.eclipse.org:29418,' -e 's,https://git.eclipse.org/r,ssh://genie.releng@git.eclipse.org:29418,' <<< $from) + fi +} +export -f toPushRepo +git submodule foreach 'if grep "^${name}:" ../../../streams/repositories_$PATCH_OR_BRANCH_LABEL.txt > /dev/null; then git tag $BUILD_ID; PUSH_URL="toPushRepo $(git remote get-url --push origin)"; git push --verbose $PUSH_URL $BUILD_ID; else echo Skipping $name; fi || :' git tag $BUILD_ID git push --verbose origin $BUILD_ID |
