add version properties to build and use in Actions

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

Author: anb0s

.github/workflows/pull_request-or-main.yml

@@ -11,6 +11,9 @@ on:
     branches:
       - main
 
+env:
+  DEFAULT_TARGET_PLATFORM: 'Eclipse-2021-12'
+
 jobs:
 
   platform:
@@ -28,12 +31,15 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: 'Build for platform: ${{ matrix.target-platform }}'
-      run: 'mvn -Dtarget.platform=${{ matrix.target-platform }} -Dsite.dir=testing clean verify'
-    - name: 'Deploy for PR${{ github.event.pull_request.number }}'
-      if: github.event_name == 'pull_request' && matrix.target-platform == 'Eclipse-2021-12'
+      run: 'mvn -Dtarget.platform=${{ matrix.target-platform }} -Dsite.dir=testing clean verify'        
+    - name: Assign build.version.properties to env variable
+      if: github.event_name == 'pull_request' && matrix.target-platform == env.DEFAULT_TARGET_PLATFORM
+      run: cat site/target/build.version.properties >> $GITHUB_ENV
+    - name: 'Deploy build ${{ env.build_version_full }} for PR${{ github.event.pull_request.number }}'
+      if: github.event_name == 'pull_request' && matrix.target-platform == env.DEFAULT_TARGET_PLATFORM
       uses: actions/upload-artifact@v2
-      with: 
-        name: EasyShell-update-site-PR${{ github.event.pull_request.number }}
+      with:
+        name: EasyShell-${{ env.build_version_full }}
         path: site/target/repository
 
   deploy-testing:

site/packaging-p2composite.ant

@@ -57,13 +57,16 @@
   <target name="compute.child.repository.data" depends="getMajorMinorVersion">
   	<property name="parent.root.dir" location="../" />
   	<property name="site.parent.dir" location="updates" />
-    <property name="full.version" value="${unqualifiedVersion}.${buildQualifier}" />
+  	<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.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="composite.repository.directory" value="${main.composite.repository.directory}/${majorMinorVersion}" />
-    <property name="child.repository" value="${full.version}" />
+    <property name="child.repository" value="${build.version.full}" />
     <property name="child.repository.directory" value="${composite.repository.directory}/${child.repository}/" />
   </target>
 
@@ -90,6 +93,10 @@
       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}"/>
+
   	<copy file="${parent.root.dir}/README.md" tofile="${site.parent.dir}/index.md" overwrite="true"/>
   </target>