This is an automated email from the ASF dual-hosted git repository.

piergiorgio pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/manifoldcf.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 442983830 updated GitHub workflow for publishing new release
442983830 is described below

commit 442983830612d89d266c87d69c7ddaa20e11f279
Author: Piergiorgio Lucidi <[email protected]>
AuthorDate: Thu Sep 26 14:53:32 2024 +0200

    updated GitHub workflow for publishing new release
---
 .github/workflows/create-docker-image.yml      |  7 +++++++
 .github/workflows/create-release-candidate.yml | 18 ++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/create-docker-image.yml 
b/.github/workflows/create-docker-image.yml
index e2c45a358..eb0fd6669 100644
--- a/.github/workflows/create-docker-image.yml
+++ b/.github/workflows/create-docker-image.yml
@@ -191,6 +191,13 @@ jobs:
           tar -xzvf apache-manifoldcf-${{ steps.mcf.outputs.release 
}}-bin.tar.gz && \
           mv apache-manifoldcf-${{ steps.mcf.outputs.release }}-dev dist && \
           rm apache-manifoldcf-${{ steps.mcf.outputs.release }}-bin.tar.gz
+      
+      - name: Update MCF version in the properties.xml files
+        run: | 
+          sed -i 's/${{ steps.mcf.outputs.release }}-dev/${{ 
steps.mcf.outputs.release }}/g' dist/example/properties.xml;
+          sed -i 's/${{ steps.mcf.outputs.release }}-dev/${{ 
steps.mcf.outputs.release }}/g' dist/example-proprietary/properties.xml;
+          sed -i 's/${{ steps.mcf.outputs.release }}-dev/${{ 
steps.mcf.outputs.release }}/g' dist/multiprocess-file-example/properties.xml;
+          sed -i 's/${{ steps.mcf.outputs.release }}-dev/${{ 
steps.mcf.outputs.release }}/g' 
dist/multiprocess-file-example-proprietary/properties.xml;
 
       - name: Set up QEMU
         uses: docker/[email protected]
diff --git a/.github/workflows/create-release-candidate.yml 
b/.github/workflows/create-release-candidate.yml
index 8ea35b85c..5c3d2ca70 100644
--- a/.github/workflows/create-release-candidate.yml
+++ b/.github/workflows/create-release-candidate.yml
@@ -67,6 +67,12 @@ jobs:
           branchVersion=${currentMavenVersion%"$suffixToRemove"}
           echo "version=${branchVersion}" >> $GITHUB_OUTPUT
       
+      - name: Create Release Version
+        id: releaseVersion
+        run: |
+          releaseVersion=${branchVersion%"-"}
+          echo "version=${releaseVersion}" >> $GITHUB_OUTPUT
+      
       - name: Set Branch Tag output
         id: branchTag
         run: echo "tag=${{ steps.branchVersion.outputs.version }}${{ 
github.event.inputs.releasecandidatetag }}" >> $GITHUB_OUTPUT
@@ -81,10 +87,10 @@ jobs:
         run: mvn versions:set -DnewVersion=${{ 
steps.mavenProjectVersion.outputs.version }} -DremoveSnapshot 
-DgenerateBackupPoms=false
       
       - name: Update Ant script with the new RC version
-        run: sed -i 's/${{ steps.mavenProjectVersion.outputs.version 
}}-dev/${{ steps.mavenProjectVersion.outputs.version }}/g' build.xml;
+        run: sed -i 's/${{ steps.releaseVersion.outputs.version }}-dev/${{ 
steps.releaseVersion.outputs.version }}/g' build.xml;
       
       - name: Update CHANGES.txt
-        run: sed -i 's/${{ steps.mavenProjectVersion.outputs.version 
}}-dev/Release ${{ steps.mavenProjectVersion.outputs.version }}/g' CHANGES.txt;
+        run: sed -i 's/${{ steps.releaseVersion.outputs.version }}-dev/Release 
${{ steps.releaseVersion.outputs.version }}/g' CHANGES.txt;
       
       - name: Ant Build
         run: ant make-core-deps make-deps image
@@ -94,10 +100,10 @@ jobs:
       
       - name: Update MCF version in the properties.xml files
         run: | 
-          sed -i 's/${{ steps.mavenProjectVersion.outputs.version }}-dev/${{ 
steps.mavenProjectVersion.outputs.version }}/g' dist/example/properties.xml;
-          sed -i 's/${{ steps.mavenProjectVersion.outputs.version }}-dev/${{ 
steps.mavenProjectVersion.outputs.version }}/g' 
dist/example-proprietary/properties.xml;
-          sed -i 's/${{ steps.mavenProjectVersion.outputs.version }}-dev/${{ 
steps.mavenProjectVersion.outputs.version }}/g' 
dist/multiprocess-file-example/properties.xml;
-          sed -i 's/${{ steps.mavenProjectVersion.outputs.version }}-dev/${{ 
steps.mavenProjectVersion.outputs.version }}/g' 
dist/multiprocess-file-example-proprietary/properties.xml;
+          sed -i 's/${{ steps.releaseVersion.outputs.version }}-dev/${{ 
steps.releaseVersion.outputs.version }}/g' dist/example/properties.xml;
+          sed -i 's/${{ steps.releaseVersion.outputs.version }}-dev/${{ 
steps.releaseVersion.outputs.version }}/g' 
dist/example-proprietary/properties.xml;
+          sed -i 's/${{ steps.releaseVersion.outputs.version }}-dev/${{ 
steps.releaseVersion.outputs.version }}/g' 
dist/multiprocess-file-example/properties.xml;
+          sed -i 's/${{ steps.releaseVersion.outputs.version }}-dev/${{ 
steps.releaseVersion.outputs.version }}/g' 
dist/multiprocess-file-example-proprietary/properties.xml;
       
       - name: RAT licence checks
         run: mvn -pl . apache-rat:check

Reply via email to