From b8fd5f48eaced87f993981d83ee371187f747848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Hannappel?= Date: Tue, 20 Apr 2021 10:42:20 +0200 Subject: [PATCH 1/5] OptionParser is now (also) hosted ad DESY gitlab --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 0727b09..67d671e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,4 @@ url = https://stash.desy.de/scm/it/cplusplusgoodies.git [submodule "OptionParser"] path = OptionParser - url = https://github.com/BGO-OD/OptionParser.git + url = https://gitlab.desy.de/ewmscp/ewmscp.git -- GitLab From 6d318f451a377182ddf27aaa367e6d1d91bdb89c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Hannappel?= Date: Tue, 20 Apr 2021 11:01:00 +0200 Subject: [PATCH 2/5] try git submodule sync iun build script --- gitlab/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gitlab/build.sh b/gitlab/build.sh index d00b1f4..1aa407a 100755 --- a/gitlab/build.sh +++ b/gitlab/build.sh @@ -3,6 +3,7 @@ pwd lscpu git submodule init git submodule update +git submodule sync mkdir -p build ls -ltra build installpath=$(pwd)/install -- GitLab From 706658783ae3f18ebde03a62d338a7cd9479bb3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Hannappel?= Date: Tue, 20 Apr 2021 11:08:37 +0200 Subject: [PATCH 3/5] no submodule sync, cleanup old OpetionParser subdir --- gitlab/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/build.sh b/gitlab/build.sh index 1aa407a..dcbbfa1 100755 --- a/gitlab/build.sh +++ b/gitlab/build.sh @@ -1,9 +1,9 @@ #!/bin/bash pwd lscpu +rm -r OptionParser git submodule init git submodule update -git submodule sync mkdir -p build ls -ltra build installpath=$(pwd)/install -- GitLab From 6835181ad34a7f1ee1b6d1caff8f47e6576bfafd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Hannappel?= Date: Tue, 20 Apr 2021 11:15:59 +0200 Subject: [PATCH 4/5] test gitlab access --- gitlab/build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gitlab/build.sh b/gitlab/build.sh index dcbbfa1..fb3658a 100755 --- a/gitlab/build.sh +++ b/gitlab/build.sh @@ -1,6 +1,12 @@ #!/bin/bash pwd lscpu +mkdir gitlabtest +cd gitlabtest +git clone git@gitlab.desy.de:ewmscp/OptionParser.git httpstuff +git clone https://gitlab.desy.de/ewmscp/OptionParser.git sshstuff +ls -l +cd - rm -r OptionParser git submodule init git submodule update -- GitLab From c56751405dae62f56c61299436a9bc941530530a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Hannappel?= Date: Tue, 20 Apr 2021 11:20:49 +0200 Subject: [PATCH 5/5] fix broken url for option parser --- .gitmodules | 2 +- gitlab/build.sh | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index 67d671e..00820ee 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,4 @@ url = https://stash.desy.de/scm/it/cplusplusgoodies.git [submodule "OptionParser"] path = OptionParser - url = https://gitlab.desy.de/ewmscp/ewmscp.git + url = https://gitlab.desy.de/ewmscp/OptionParser.git diff --git a/gitlab/build.sh b/gitlab/build.sh index fb3658a..d00b1f4 100755 --- a/gitlab/build.sh +++ b/gitlab/build.sh @@ -1,13 +1,6 @@ #!/bin/bash pwd lscpu -mkdir gitlabtest -cd gitlabtest -git clone git@gitlab.desy.de:ewmscp/OptionParser.git httpstuff -git clone https://gitlab.desy.de/ewmscp/OptionParser.git sshstuff -ls -l -cd - -rm -r OptionParser git submodule init git submodule update mkdir -p build -- GitLab