updated GitHub workflow for publishing new release

apache · Sep 26, 2024 · 4429838 · 4429838
1 parent ec0f15a
commit 4429838
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git 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
@@ -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