diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9e2c559..9333fc6b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,6 +98,7 @@ jobs: export PATH=$SUPERDOIT_ROOT/bin:$GSDEVKIT_STONES_ROOT/bin:$PATH + export CI="true" $GSDEVKIT_STONES_ROOT/tests/test_1.sh shell: bash slack-workflow-status: diff --git a/tests/createTestProjectSet.sh b/tests/createTestProjectSet.sh index b5331d1e..c8e48f46 100755 --- a/tests/createTestProjectSet.sh +++ b/tests/createTestProjectSet.sh @@ -30,16 +30,28 @@ if [ $status == 1 ]; then echo "project set $projectSet exists" fi +if [ "$urlType" = "ssh" ] ; then + url1="git@github.com:GsDevKit/GsDevKit_stones.git" + url2="git@git.gemtalksystems.com:GsDevKit_stones" + revision="v1.1.1" + theProjectName=GsDevKit_stones +else + url1="https://github.com/GsDevKit/Seaside31.git" + url2="https://github.com/glassdb/Seaside31.git" + revision=master + theProjectName=Seaside31 +fi + updateProjectSet.solo --registry=$registry --projectSet=$projectSet \ - --projectName=GsDevKit_stones \ - --gitUrl=git@github.com:GsDevKit/GsDevKit_stones.git \ - --remote=origin \ - --revision=v1.1.1 $* + --projectName=$theProjectName \ + --gitUrl=$url1\ + --remote=origin \ + --revision=$revision $* updateProjectSet.solo --registry=$registry --projectSet=$projectSet \ - --projectName=GsDevKit_stones \ - --gitUrl=git@git.gemtalksystems.com:GsDevKit_stones \ - --remote=gs \ - --revision=v1.1.1 $* + --projectName=$theProjectName \ + --gitUrl=$url2 \ + --remote=gs \ + --revision=$revision $* diff --git a/tests/test_1.sh b/tests/test_1.sh index c44b2355..7f2009cf 100755 --- a/tests/test_1.sh +++ b/tests/test_1.sh @@ -9,6 +9,10 @@ else fi registry=test projectSet=xxx +export urlType=ssh +if [ "$CI" = "true" ]; then + export urlType=https +fi set +e registryReport.solo --registry=$registry