improve testing PR action and target the main branch

Signed-off-by: Andre Bossert <anb0s@anbos.de>

Author: anb0s

.github/workflows/testing.yml

@@ -27,9 +27,10 @@ jobs:
     - name: 'Create Pull Request'
       uses: peter-evans/create-pull-request@v3
       with:
-        title: 'testing of build ${{ env.build_version_full }}'
+        commit-message: '[${{ env.build_version_unqualified }}] testing build ${{ env.build_version_full }}'
+        title: '[${{ env.build_version_unqualified }}] testing of build ${{ env.build_version_full }}'
         body: |
-          ### I need help with testing of the build **${{ env.build_version_full }}**
+          ### Help wanted with testing of the build **${{ env.build_version_full }}**
           
           It is available at the testing update site now: http://anb0s.github.io/EasyShell/testing
           Version: **EasyShell ${{ env.build_version_full }}**
@@ -38,7 +39,10 @@ jobs:
             
           ### All fixed issues 
           
-          [milestone ${{ env.build_version_unqualified }}](https://github.com/anb0s/EasyShell/milestone/8?closed=1)
+          [milestone ${{ env.build_version_unqualified }}](https://github.com/anb0s/EasyShell/milestone/${{ env.build_version_milestone }}?closed=1)
         labels: |
           help wanted
           Version ${{ env.build_version_unqualified }}
+        milestone: ${{ env.build_version_milestone }}
+        delete-branch: true
+        base: main

pom.xml

@@ -19,6 +19,7 @@
 
   <properties>
     <new.version>2.3.0-SNAPSHOT</new.version>
+    <version.milestone>8</version.milestone>
     <tycho.version>2.7.0</tycho.version>
     <target.platform>Eclipse-2021-12</target.platform>
     <target.platform.url>http://download.eclipse.org/releases/2021-12</target.platform.url>

site/packaging-p2composite.ant

@@ -60,6 +60,7 @@
   	<property name="build.version.unqualified" value="${unqualifiedVersion}" />
   	<property name="build.version.qualifier" value="${buildQualifier}" />
     <property name="build.version.full" value="${build.version.unqualified}.${build.version.qualifier}" />
+  	<property name="build.version.milestone" value="${buildMilestone}" />
   	<property name="build.version.file" location="${project.build.directory}/build.version.properties" />
     <property name="site.composite.name" value="${site.label} ${majorMinorVersion}" />
     <ucfirst string="${site.dir}" to="site.dir.ucfirst" />
@@ -96,6 +97,7 @@
   	<echo file="${build.version.file}" append="false" message="build_version_unqualified=${build.version.unqualified}${line.separator}"/>
   	<echo file="${build.version.file}" append="true"  message="build_version_qualifier=${build.version.qualifier}${line.separator}"/>
   	<echo file="${build.version.file}" append="true"  message="build_version_full=${build.version.full}${line.separator}"/>
+  	<echo file="${build.version.file}" append="true"  message="build_version_milestone=${build.version.milestone}${line.separator}"/>
 
   	<copy file="${parent.root.dir}/README.md" tofile="${site.parent.dir}/index.md" overwrite="true"/>
   </target>

site/pom.xml

@@ -27,7 +27,7 @@
         <version>${tycho.version}</version>
         <configuration>
           <!-- IMPORTANT: DO NOT split the arg line -->
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile packaging-p2composite.ant p2.composite.add -Dsite.label="EasyShell" -Dsite.dir=${site.dir} -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -DbuildQualifier=${buildQualifier}</appArgLine>
+          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile packaging-p2composite.ant p2.composite.add -Dsite.label="EasyShell" -Dsite.dir=${site.dir} -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -DbuildQualifier=${buildQualifier} -DbuildMilestone=${version.milestone}</appArgLine>
           <repositories>
             <repository>
               <id>${target.platform.name}</id>