Merge pull request #291 from jfdenise/main

Skip Preview for nightly, no more transformer in galleon-plugins
wildfly · Apr 16, 2024 · c1c7e51 · c1c7e51
2 parents 249f1d6 + bd894ea
commit c1c7e51
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/nightly-workflow.yml b/.github/workflows/nightly-workflow.yml
@@ -31,4 +31,5 @@ jobs:
     needs: check_date
     if: ${{ needs.check_date.outputs.should_run != 'false' }}
     with:
-      wildfly-ref: ${{ inputs.wildfly-ref }}
+      wildfly-ref: ${{ inputs.wildfly-ref }}
+      wildfly-extra-args: -Dskip.preview
diff --git a/.github/workflows/testing-workflow.yml b/.github/workflows/testing-workflow.yml
@@ -11,6 +11,10 @@ on:
         required: false
         default: "main"
         type: string
+      wildfly-extra-args:
+        description: "Extra args to provide to WildFly build/test"
+        required: false
+        type: string
 jobs:  
   galleon-plugins-build:
     name: galleon-plugins-${{ matrix.os }}-jdk${{ matrix.java }}
@@ -60,7 +64,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.glow=1.0.0.Beta12 -Dversion.org.wildfly.plugin=5.0.0.Beta4 -Dversion.org.jboss.galleon=${{needs.galleon-plugins-build.outputs.galleon-version}} -Dversion.org.wildfly.galleon-plugins=${{needs.galleon-plugins-build.outputs.galleon-plugins-version}}'
+      build-arguments: '-Dversion.org.wildfly.glow=1.0.0.Final -Dversion.org.wildfly.plugin=5.0.0.Final -Dversion.org.jboss.galleon=${{needs.galleon-plugins-build.outputs.galleon-version}} -Dversion.org.wildfly.galleon-plugins=${{needs.galleon-plugins-build.outputs.galleon-plugins-version}} ${{ inputs.wildfly-extra-args }}'
       java-versions: "['11', '17']"
       os: "['ubuntu-latest', 'windows-latest']"
       maven-repo-name: galleon-plugins-maven-repository
@@ -73,7 +77,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.glow=1.0.0.Beta12 -Dversion.org.wildfly.plugin=5.0.0.Beta4 -Dversion.org.jboss.galleon=${{needs.galleon-plugins-build.outputs.galleon-version}} -Dversion.org.wildfly.galleon-plugins=${{needs.galleon-plugins-build.outputs.galleon-plugins-version}}'
+      build-arguments: '-Dversion.org.wildfly.glow=1.0.0.Final -Dversion.org.wildfly.plugin=5.0.0.Final -Dversion.org.jboss.galleon=${{needs.galleon-plugins-build.outputs.galleon-version}} -Dversion.org.wildfly.galleon-plugins=${{needs.galleon-plugins-build.outputs.galleon-plugins-version}} ${{ inputs.wildfly-extra-args }}'
       os: "['ubuntu-latest']"
       java-versions: "['11']"
       maven-repo-name: galleon-plugins-maven-repository
@@ -86,7 +90,7 @@ jobs:
     uses: wildfly/wildfly/.github/workflows/shared-wildfly-build-and-test.yml@main
     with:
       test-arguments: '-Dts.preview'
-      build-arguments: '-Dversion.org.wildfly.glow=1.0.0.Beta12 -Dversion.org.wildfly.plugin=5.0.0.Beta4 -Dversion.org.jboss.galleon=${{needs.galleon-plugins-build.outputs.galleon-version}} -Dversion.org.wildfly.galleon-plugins=${{needs.galleon-plugins-build.outputs.galleon-plugins-version}}'
+      build-arguments: '-Dversion.org.wildfly.glow=1.0.0.Final -Dversion.org.wildfly.plugin=5.0.0.Final -Dversion.org.jboss.galleon=${{needs.galleon-plugins-build.outputs.galleon-version}} -Dversion.org.wildfly.galleon-plugins=${{needs.galleon-plugins-build.outputs.galleon-plugins-version}} ${{ inputs.wildfly-extra-args }}'
       java-versions: "['17']"
       os: "['ubuntu-latest']"
       maven-repo-name: galleon-plugins-maven-repository
@@ -121,7 +125,7 @@ jobs:
       run: |
          tar -xzf galleon-plugins-maven-repository.tar.gz -C ~
     - name: Build and Test WildFly Datasources galleon-pack with SNAPSHOT build of galleon-plugins
-      run: mvn clean install -Dversion.org.wildfly.jar.plugin=11.0.0.Beta1 -Dversion.org.wildfly.galleon-plugins=${{needs.galleon-plugins-build.outputs.galleon-plugins-version}}
+      run: mvn clean install -Dversion.org.wildfly.jar.plugin=11.0.0.Final -Dversion.org.wildfly.galleon-plugins=${{needs.galleon-plugins-build.outputs.galleon-plugins-version}}
       shell: bash
     - name: Upload Test Reports on Failure
       uses: actions/upload-artifact@v3