also check package.xml version

Author: KevinVlaanderen

.github/workflows/build-module.yml

@@ -2,10 +2,12 @@ name: Build module
 on:
   workflow_call:
     outputs:
-      widget-version:
-        value: ${{ jobs.build-widget.outputs.widget-version }}
-      module-version:
-        value: ${{ jobs.build-module.outputs.module-version }}
+      package-json-version:
+        value: ${{ jobs.build-module.outputs.package-json-version }}
+      package-xml-version:
+        value: ${{ jobs.build-module.outputs.package-xml-version }}
+      build-gradle-version:
+        value: ${{ jobs.build-module.outputs.build-gradle-version }}
 jobs:
   build-widget:
     uses: ./.github/workflows/build-widget.yml
@@ -14,24 +16,30 @@ jobs:
     runs-on: windows-latest
     needs: build-widget
     outputs:
-      module-version: ${{ steps.module-version.outputs.module-version }}
+      package-json-version: ${{ steps.widget-versions.outputs.package-json-version }}
+      package-xml-version: ${{ steps.widget-versions.outputs.package-xml-version }}
+      build-gradle-version: ${{ steps.build-gradle-version.outputs.build-gradle-version }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
       - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # 4.7.1
         with:
           distribution: 'adopt'
           java-version: '21'
       - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # 4.3.1
-      - name: Define MODULE_VERSION
+      - name: Set widget versions
+        id: widget-versions
         run: |
-          echo "MODULE_VERSION=$(./gradlew -q printModuleVersion)" >> $env:GITHUB_ENV
+          echo "package-json-version=${{ needs.build-widget.outputs.package-json-version }}" >> $env:GITHUB_OUTPUT
+          echo "package-xml-version=${{ needs.build-widget.outputs.package-xml-version }}" >> $env:GITHUB_OUTPUT
+      - name: Get version from build.gradle
+        id: build-gradle-version
+        run: |
+          echo "build-gradle-version=$(./gradlew -q printModuleVersion)" >> $env:GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Show MODULE_VERSION
-        id: module-version
+      - name: Show versions
         run: |
-          echo "module-version=$env:MODULE_VERSION" >> $env:GITHUB_OUTPUT
-          echo "$env:MODULE_VERSION"
+          echo "Version in build.gradle: ${{ steps.build-gradle-version.outputs.build-gradle-version }}"
       - name: "Detected module version"
         run: echo $env:MODULE_VERSION
       - uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # 4.2.1
@@ -45,5 +53,5 @@ jobs:
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
         with:
           name: module
-          path: module/dist/PushNotifications-${{ env.MODULE_VERSION }}.mpk
+          path: module/dist/PushNotifications-${{ steps.build-gradle-version.outputs.build-gradle-version }}.mpk
           compression-level: 0

.github/workflows/build-widget.yml

@@ -2,16 +2,18 @@ name: Build widget
 on:
   workflow_call:
     outputs:
-      widget-version:
-        value: ${{ jobs.build.outputs.widget-version }}
+      package-json-version:
+        value: ${{ jobs.build.outputs.package-json-version }}
+      package-xml-version:
+        value: ${{ jobs.build.outputs.info }}
 defaults:
   run:
     working-directory: ./widget
 jobs:
   build:
     runs-on: ubuntu-latest
     outputs:
-      widget-version: ${{ steps.widget-version.outputs.widget-version }}
+      widget-package-version: ${{ steps.widget-version.outputs.widget-package-version }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
         with:
@@ -21,15 +23,21 @@ jobs:
           node-version: 6
           cache: "npm"
           cache-dependency-path: widget/package-lock.json
-      - name: Define WIDGET_VERSION
+      - name: Get version from package.json
+        id: package-json-version
         working-directory: widget
         run: |
-          echo "WIDGET_VERSION=$(cat package.json | jq -r '.version')" >> $GITHUB_ENV
-      - name: Show WIDGET_VERSION
-        id: widget-version
+          echo "package-json-version=$(cat package.json | jq -r '.version')" >> $GITHUB_OUTPUT
+      - name: Get version from package.xml
+        id: package-xml-version
+        uses: mavrosxristoforos/get-xml-info@afaa5058ead44cfaff92c6a861b46dd7a8929f60 # 2.0.0
+        with:
+          xml-file: "widget/src/package.xml"
+          xpath: "//*[local-name()='clientModule']/@version"
+      - name: Show versions
         run: |
-          echo "widget-version=$WIDGET_VERSION" >> $GITHUB_OUTPUT
-          echo "$WIDGET_VERSION"
+          echo "Version in package.json: ${{ steps.package-json-version.outputs.package-json-version }}"
+          echo "Version in package.xml: ${{ steps.package-xml-version.outputs.info }}"
       - name: "Install dependencies"
         run: npm install
       - name: "Build widget"

.github/workflows/release-draft.yml

@@ -17,8 +17,11 @@ jobs:
       - build-module
     steps:
       - run: |
-          if [[ ${{ needs.build-module.outputs.module-version }} != ${{ needs.build-module.outputs.widget-version }} ]]; then
-            echo "Module version (${{ needs.build-module.outputs.module-version }}) and widget version (${{ needs.build-module.outputs.widget-version }}) do not match"
+          if [[ ${{ needs.build-module.outputs.package-json-version }} != ${{ needs.build-module.outputs.package-xml-version }} || ${{ needs.build-module.outputs.package-json-version }} !\ ${{ needs.build-module.outputs.build-gradle-version }} ]]; then
+            echo "Versions do not match"
+            echo "package.json version: ${{ needs.build-module.outputs.package-json-version }}"
+            echo "package.xml version: ${{ needs.build-module.outputs.package-xml-version }}"
+            echo "build.gradle version: ${{ needs.build-module.outputs.build-gradle-version }}"
             exit 1
           fi
   documentation:
@@ -45,7 +48,7 @@ jobs:
           name: widget
       - uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # 2.2.1
         with:
-          name: "Marketplace release v${{ needs.build-module.outputs.module-version }}"
+          name: "Marketplace release v${{ needs.build-module.outputs.build-gradle-version }}"
           body_path: CHANGELOG.md
           draft: true
           files: |