add pre-release body and artifacts

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

Author: anb0s

.github/workflows/pre_release.yml

@@ -6,8 +6,10 @@ name: Pre-Release
 on:
   push:
     tags:
-      - "v*.*.*-beta.*"
-      - "v*.*.*-rc.*"
+      - "v*.*.*-pre*"
+      - "v*.*.*-alpha*"
+      - "v*.*.*-beta*"
+      - "v*.*.*-rc*"
 
 jobs:
 
@@ -21,7 +23,22 @@ jobs:
         branch: gh-pages
         folder: site/updates
         clean: false
+    - name: Assign build.version.properties to env variable
+      run: cat site/updates/testing/build.version.properties >> $GITHUB_ENV
     - name: Pre-Release
       uses: softprops/action-gh-release@v1
       with:
-        generate_release_notes: true
+        generate_release_notes: true
+        prerelease: true
+        body: |
+          ### 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 }}**
+          
+          **Use "Help | Install New Software...", paste the link and select the right version!**
+          
+          ### All fixed issues 
+          
+          [milestone ${{ env.build_version_unqualified }}](https://github.com/anb0s/EasyShell/milestone/${{ env.build_version_milestone }}?closed=1)
+        artifacts: "${{ env.build_version_path }}"

.github/workflows/testing.yml

@@ -23,21 +23,14 @@ jobs:
     - name: Build testing for default platform
       run: 'mvn -Dsite.dir=testing clean verify'
     - name: Assign build.version.properties to env variable
-      run: cat site/target/build.version.properties >> $GITHUB_ENV
+      run: cat site/updates/testing/build.version.properties >> $GITHUB_ENV
     - name: Create Pull Request
       uses: peter-evans/create-pull-request@v3
       with:
         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: |
-          ### 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 }}**
-            
-          **Use "Help | Install New Software...", paste the link and select the right version!**
-            
-          ### All fixed issues 
+          ### Fixed issues 
           
           [milestone ${{ env.build_version_unqualified }}](https://github.com/anb0s/EasyShell/milestone/${{ env.build_version_milestone }}?closed=1)
         labels: |

site/packaging-p2composite.ant

@@ -55,20 +55,23 @@
     buildQualifier		The build qualifier
   -->
   <target name="compute.child.repository.data" depends="getMajorMinorVersion">
-  	<property name="parent.root.dir" location="../" />
-  	<property name="site.parent.dir" location="updates" />
-  	<property name="build.version.unqualified" value="${unqualifiedVersion}" />
-  	<property name="build.version.qualifier" value="${buildQualifier}" />
+    <property name="parent.root.dir" location="../" />
+    <property name="site.parent.dir" location="updates" />
+  	<property name="build.version.major_minor" value="${majorMinorVersion}" />
+    <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="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" />
     <property name="main.site.composite.name" value="${site.label} ${site.dir.ucfirst} Versions" />
     <property name="main.composite.repository.directory" location="${site.parent.dir}/${site.dir}" />
+    <property name="site.build.version.file" location="${main.composite.repository.directory}/build.version.properties" />
     <property name="composite.repository.directory" value="${main.composite.repository.directory}/${majorMinorVersion}" />
     <property name="child.repository" value="${build.version.full}" />
     <property name="child.repository.directory" value="${composite.repository.directory}/${child.repository}/" />
+    <property name="build.version.path" value="${build.version.major_minor}/${build.version.full}" />
   </target>
 
   <target name="p2.composite.add" depends="compute.child.repository.data">
@@ -94,12 +97,15 @@
       composite.repository.child="${majorMinorVersion}"
     />
 
-  	<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}"/>
+    <echo file="${build.version.file}" append="false" message="build_version_major_minor=${build.version.major_minor}${line.separator}"/>
+    <echo file="${build.version.file}" append="true"  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_path=${build.version.path}${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"/>
+    <copy file="${parent.root.dir}/README.md" tofile="${site.parent.dir}/index.md" overwrite="true"/>
+    <copy file="${build.version.file}" tofile="$site.build.version.file}" overwrite="true"/>
   </target>
 
   <!-- = = = = = = = = = = = = = = = = =