Use same galleon version in github actions

wildfly · Jan 29, 2024 · 1da44f7 · 1da44f7
1 parent 3fb6b87
commit 1da44f7
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,6 +17,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     outputs:
       galleon-plugins-version: ${{ steps.version.outputs.galleon-plugins-version }}
+      galleon-version: ${{ steps.version.outputs.galleon-version }}
     strategy:
       fail-fast: false
       matrix:
@@ -34,7 +35,9 @@ jobs:
         run: mvn -U -B -ntp clean install
         shell: bash
       - id: version
-        run: echo "galleon-plugins-version=$(mvn -B help:evaluate -Dexpression=project.version -DforceStdout -q)" >> $GITHUB_OUTPUT
+        run: |
+          echo "galleon-plugins-version=$(mvn -B help:evaluate -Dexpression=project.version -DforceStdout -q)" >> $GITHUB_OUTPUT
+          echo "galleon-version=$(mvn -B help:evaluate -Dexpression=version.org.jboss.galleon -DforceStdout -q)" >> $GITHUB_OUTPUT
       - name: Archive the repository
         if: matrix.java == '11'
         run:  |
@@ -57,7 +60,7 @@ jobs:
     name: Linux/Windows - JDK11 and JDK17
     uses: wildfly/wildfly/.github/workflows/shared-wildfly-build-and-test.yml@main
     with:
-      build-arguments: '-Dversion.org.wildfly.plugin=5.0.0.Beta2 -Dversion.org.wildfly.galleon-plugins=${{needs.galleon-plugins-build.outputs.galleon-plugins-version}}'
+      build-arguments: '-Dversion.org.wildfly.plugin=5.0.0.Beta2 -Dversion.org.jboss.galleon=${{needs.galleon-plugins-build.outputs.galleon-version}} -Dversion.org.wildfly.galleon-plugins=${{needs.galleon-plugins-build.outputs.galleon-plugins-version}}'
       java-versions: "['11', '17']"
       os: "['ubuntu-latest', 'windows-latest']"
       maven-repo-name: galleon-plugins-maven-repository
@@ -70,7 +73,7 @@ jobs:
     uses: wildfly/wildfly/.github/workflows/shared-wildfly-build-and-test.yml@main
     with:
       test-arguments: '-Dts.layers -Dts.galleon'
-      build-arguments: '-Dversion.org.wildfly.plugin=5.0.0.Beta2 -Dversion.org.wildfly.galleon-plugins=${{needs.galleon-plugins-build.outputs.galleon-plugins-version}}'
+      build-arguments: '-Dversion.org.wildfly.plugin=5.0.0.Beta2 -Dversion.org.jboss.galleon=${{needs.galleon-plugins-build.outputs.galleon-version}} -Dversion.org.wildfly.galleon-plugins=${{needs.galleon-plugins-build.outputs.galleon-plugins-version}}'
       os: "['ubuntu-latest']"
       java-versions: "['11']"
       maven-repo-name: galleon-plugins-maven-repository
@@ -82,7 +85,7 @@ jobs:
     uses: wildfly/wildfly/.github/workflows/shared-wildfly-build-and-test.yml@main
     with:
       test-arguments: '-Dts.preview'
-      build-arguments: '-Dversion.org.wildfly.plugin=5.0.0.Beta2 -Dversion.org.wildfly.galleon-plugins=${{needs.galleon-plugins-build.outputs.galleon-plugins-version}}'
+      build-arguments: '-Dversion.org.wildfly.plugin=5.0.0.Beta2 -Dversion.org.jboss.galleon=${{needs.galleon-plugins-build.outputs.galleon-version}} -Dversion.org.wildfly.galleon-plugins=${{needs.galleon-plugins-build.outputs.galleon-plugins-version}}'
       java-versions: "['17']"
       os: "['ubuntu-latest']"
       maven-repo-name: galleon-plugins-maven-repository