Commit 687d0d35 authored by Eyrak Paen-Rochlitz's avatar Eyrak Paen-Rochlitz
Browse files

Merge branch '35-etrice-setup-gitlab' into 'master'

[team] add gitlab remote to git clone task in ETrice.setup

Closes #35

See merge request !9
parents e55c4def d9d0bae1
Pipeline #4217 passed with stage
in 0 seconds
......@@ -13,6 +13,97 @@
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
name="etrice"
label="eTrice">
<setupTask
xsi:type="setup:CompoundTask"
name="Gitlab">
<setupTask
xsi:type="setup:VariableTask"
name="gitlab.git.authentication.style"
value="anonymous"
label="Gitlab Git Authentication Style">
<annotation
source="http://www.eclipse.org/oomph/setup/GlobalVariable"/>
<choice
value="anonymous"
label="Anonymous Authentication"/>
<choice
value="ssh"
label="SSH Authentication"/>
<choice
value="credentials"
label="Credentials Authentication"/>
<description>Choose the style of authentication used to access Gitlab Git clones</description>
</setupTask>
<setupTask
xsi:type="setup:CompoundTask"
filter="(&amp;(!(gitlab.git.authentication.style=ssh))(!(gitlab.git.authentication.style=credentials)))"
name="Anonymous Git Authentication">
<setupTask
xsi:type="setup:VariableTask"
name="gitlab.remoteURIs"
label="Gitlab repository">
<choice
value="https://gitlab.eclipse.org/@{remoteURI}.git"
label="HTTPS (read-only, anonymous)"/>
<choice
value="git@gitlab.eclipse.org:@{remoteURI}.git"
label="Git (read-write)"/>
<choice
value="https://${git.user.id|username}@gitlab.eclipse.org/@{remoteURI}.git"
label="HTTPS (read-write)">
<annotation
source="http://www.eclipse.org/oomph/setup/MatchChoice"/>
</choice>
<description>Choose from the available Gitlab URIs</description>
</setupTask>
</setupTask>
<setupTask
xsi:type="setup:CompoundTask"
filter="(gitlab.git.authentication.style=ssh)"
name="SSH Authentication">
<setupTask
xsi:type="setup:VariableTask"
name="gitlab.remoteURIs"
label="Gitlab repository">
<choice
value="git@gitlab.eclipse.org:@{remoteURI}.git"
label="Git (read-write)"/>
<choice
value="https://gitlab.eclipse.org/@{remoteURI}.git"
label="HTTPS (read-only, anonymous)"/>
<choice
value="https://${git.user.id|username}@gitlab.eclipse.org/@{remoteURI}.git"
label="HTTPS (read-write)">
<annotation
source="http://www.eclipse.org/oomph/setup/MatchChoice"/>
</choice>
<description>Choose from the available Gitlab URIs</description>
</setupTask>
</setupTask>
<setupTask
xsi:type="setup:CompoundTask"
filter="(gitlab.git.authentication.style=credentials)"
name="Credentials Authentication">
<setupTask
xsi:type="setup:VariableTask"
name="gitlab.remoteURIs"
label="Gitlab repository">
<choice
value="https://${git.user.id|username}@gitlab.eclipse.org/@{remoteURI}.git"
label="HTTPS (read-write)">
<annotation
source="http://www.eclipse.org/oomph/setup/MatchChoice"/>
</choice>
<choice
value="https://gitlab.eclipse.org/@{remoteURI}.git"
label="HTTPS (read-only, anonymous)"/>
<choice
value="git@gitlab.eclipse.org:@{remoteURI}.git"
label="Git (read-write)"/>
<description>Choose from the available Gitlab URIs</description>
</setupTask>
</setupTask>
</setupTask>
<setupTask
xsi:type="jdt:JRETask"
version="JavaSE-11"
......@@ -75,6 +166,8 @@
optional="true"/>
<requirement
name="org.eclipse.egit.feature.group"/>
<requirement
name="org.eclipse.lsp4j.sdk.feature.group"/>
<requirement
name="org.apache.commons.io"/>
<repository
......@@ -199,20 +292,20 @@
</setupTask>
<setupTask
xsi:type="git:GitCloneTask"
id="git.clone"
id="git.clone.etrice"
filter=""
remoteName="gerrit"
remoteURI="etrice/org.eclipse.etrice"
remoteName="gitlab"
remoteURI="eclipse/etrice/etrice"
pushURI="">
<annotation
source="http://www.eclipse.org/oomph/setup/InducedChoices">
<detail
key="inherit">
<value>eclipse.gerrit.remoteURIs</value>
<value>gitlab.remoteURIs</value>
</detail>
<detail
key="label">
<value>${scope.project.label} Gerrit repository</value>
<value>${scope.project.label} Dev repository</value>
</detail>
<detail
key="target">
......@@ -240,41 +333,12 @@
key="email"
value="${git.author.email}"/>
</configSections>
<configSections
name="remote &quot;gerrit ssh&quot;">
<properties
key="url"
value="ssh://${git.user.id}@git.eclipse.org:29418/etrice/org.eclipse.etrice.git"/>
<properties
key="fetch"
value="+refs/heads/*:refs/remotes/gerrit/*"/>
<properties
key="push"
value="HEAD:refs/for/master"/>
</configSections>
<configSections
name="remote &quot;gerrit bypass ssh&quot;">
<properties
key="pushurl"
value="ssh://${git.user.id}@git.eclipse.org:29418/etrice/org.eclipse.etrice.git"/>
<properties
key="push"
value="HEAD:refs/heads/master"/>
</configSections>
<configSections
name="remote &quot;github&quot;">
<properties
key="url"
value="https://github.com/protossoftware/etrice.git"/>
<properties
key="fetch"
value="+refs/heads/*:refs/remotes/github/*"/>
</configSections>
<description>${scope.project.label}</description>
</setupTask>
<setupTask
xsi:type="git:GitCloneTask"
id="git.clone.website"
id="git.clone.etrice-website"
location="${installation.location/git/etrice-website}"
remoteName="gerrit"
remoteURI="www.eclipse.org/etrice"
checkoutBranch="master">
......@@ -337,7 +401,7 @@
<setupTask
xsi:type="projects:ProjectsImportTask">
<sourceLocator
rootFolder="${git.clone.location}">
rootFolder="${git.clone.etrice.location}">
<excludedPath>examples</excludedPath>
<excludedPath>runtime</excludedPath>
<predicate
......@@ -348,7 +412,13 @@
</predicate>
</sourceLocator>
<sourceLocator
rootFolder="${git.clone.website.location}"/>
rootFolder="${git.clone.etrice.location/runtime}">
<predicate
xsi:type="predicates:NaturePredicate"
nature="org.eclipse.jdt.core.javanature"/>
</sourceLocator>
<sourceLocator
rootFolder="${git.clone.etrice-website.location}"/>
</setupTask>
<setupTask
xsi:type="setup.workingsets:WorkingSetTask"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment