Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor workflows #3740

Merged
merged 3 commits into from
Aug 8, 2023
Merged

Refactor workflows #3740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
307b6f1
Update the paths to ignore for CI runs.
jamezp Aug 4, 2023
d2f5d1f
Enable a profile which provisions a test server without provisioning …
jamezp Aug 7, 2023
9270c16
Remove the group for the logs.
jamezp Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 8 additions & 12 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ on:
paths-ignore:
- '.gitignore'
- ".github/workflows/manual-*.yml"
- ".mvn"
- "docbook"
- "distribution"
- ".mvn/**"
- "docbook/**"
- "distribution/**"
- "CODEOWNERS"
- "CODE_OF_CONDUCT.md"
- "CONTRIBUTING.adoc"
Expand All @@ -22,16 +22,16 @@ on:
- "mvnw.cmd"
- "README.md"
- "SECURITY.md"
- "*/README.MD"
- "**/README.MD"
pull_request:
branches:
- '**'
paths-ignore:
- '.gitignore'
- ".github/workflows/manual-*.yml"
- ".mvn"
- "docbook"
- "distribution"
- ".mvn/**"
- "docbook/**"
- "distribution/**"
- "CODEOWNERS"
- "CODE_OF_CONDUCT.md"
- "CONTRIBUTING.adoc"
Expand All @@ -41,7 +41,7 @@ on:
- "mvnw.cmd"
- "README.md"
- "SECURITY.md"
- "*/README.MD"
- "**/README.MD"

# Only run the latest job
concurrency:
Expand Down Expand Up @@ -70,9 +70,7 @@ jobs:
cache: 'maven'
- name: Build with Maven Java ${{ matrix.java }} on WildFly ${{ matrix.wildfly-version }} - ${{ matrix.os }}
run: |
echo "::group::Build Logs"
mvn clean install -U -B -fae '-Dserver.version=${{ matrix.wildfly-version }}' '-Dgithub.actions'
echo "::endgroup::"
- uses: actions/upload-artifact@v3
if: failure()
with:
Expand Down Expand Up @@ -106,9 +104,7 @@ jobs:
cache: 'maven'
- name: Test with ${{ matrix.profile }} - JDK ${{ matrix.java }} - WildFly ${{ matrix.wildfly-version }}
run: |
echo "::group::Build Logs"
mvn clean install -U -B -fae ${{ matrix.profile }} '-Dserver.version=${{ matrix.wildfly-version }}' '-Dgithub.actions'
echo "::endgroup::"
- uses: actions/upload-artifact@v3
if: failure()
with:
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/wildfly-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ on:
paths-ignore:
- '.gitignore'
- ".github/workflows/manual-*.yml"
- ".mvn"
- "docbook"
- "distribution"
- ".mvn/**"
- "docbook/**"
- "distribution/**"
- "CODEOWNERS"
- "CODE_OF_CONDUCT.md"
- "CONTRIBUTING.adoc"
Expand All @@ -21,7 +21,7 @@ on:
- "mvnw.cmd"
- "README.md"
- "SECURITY.md"
- "*/README.MD"
- "**/README.MD"
schedule:
- cron: '0 0 * * *' # Every day at 00:00 UTC

Expand Down Expand Up @@ -87,6 +87,7 @@ jobs:
profile:
- '-Dsecurity.manager'
- '-Dprovision.preview'
- '-am -Pprovision-without-resteasy,without-jackson -pl testsuite/integration-tests'

steps:
- uses: actions/checkout@v3
Expand All @@ -105,9 +106,7 @@ jobs:
cache: 'maven'
- name: Test with ${{ matrix.profile }} - JDK ${{ matrix.java }}
run: |
echo "::group::Build Logs"
mvn clean install -U -B -fae ${{ matrix.profile }} '-Dserver.version=${{needs.wildfly-build.outputs.wildfly-version}}'
echo "::endgroup::"
- uses: actions/upload-artifact@v3
if: failure()
with:
Expand Down
10 changes: 1 addition & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,13 @@
<skipTests>${maven.test.skip}</skipTests>
<wildfly.skip>${skipTests}</wildfly.skip>

<!-- Galleon -->
<!-- Provisioning settings -->
<galleon.fork.embedded>true</galleon.fork.embedded>
<galleon.log.time>true</galleon.log.time>
<galleon.offline>false</galleon.offline>
<galleon.skip>${skipTests}</galleon.skip>

<!-- Plugins versions -->
<version.javadoc.plugin>3.3.1</version.javadoc.plugin>
<version.org.jacoco.plugin>0.8.10</version.org.jacoco.plugin>
<version.org.jboss.galleon>5.2.0.Final</version.org.jboss.galleon>
<version.org.wildfly.galleon-plugins>6.4.2.Final</version.org.wildfly.galleon-plugins>
<version.org.wildfly.plugins.wildfly-maven-plugin>4.2.0.Final</version.org.wildfly.plugins.wildfly-maven-plugin>

Expand Down Expand Up @@ -364,11 +361,6 @@
<version>${version.org.jacoco.plugin}</version>
</plugin>

<plugin>
<groupId>org.jboss.galleon</groupId>
<artifactId>galleon-maven-plugin</artifactId>
<version>${version.org.jboss.galleon}</version>
</plugin>
<plugin>
<groupId>org.wildfly.galleon-plugins</groupId>
<artifactId>wildfly-galleon-maven-plugin</artifactId>
Expand Down
165 changes: 121 additions & 44 deletions testsuite/integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,46 @@
<build>
<plugins>
<plugin>
<groupId>org.jboss.galleon</groupId>
<artifactId>galleon-maven-plugin</artifactId>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<executions>
<execution>
<id>server-provisioning</id>
<phase>generate-test-resources</phase>
<goals>
<goal>provision</goal>
</goals>
<configuration>
<feature-packs>
<feature-pack>
<groupId>${server.test.feature.pack.groupId}</groupId>
<artifactId>${server.test.feature.pack.artifactId}</artifactId>
<version>${server.test.feature.pack.version}</version>
<inherit-configs>false</inherit-configs>
<included-configs>
<config>
<model>standalone</model>
<name>standalone-full.xml</name>
</config>
<config>
<model>standalone</model>
<name>standalone.xml</name>
</config>
</included-configs>
<excluded-packages>
<name>docs.schema</name>
<name>appclient</name>
<name>domain</name>
</excluded-packages>
</feature-pack>
<feature-pack>
<groupId>${resteasy.test.feature.pack.groupId}</groupId>
<artifactId>${resteasy.test.feature.pack.artifactId}</artifactId>
<version>${resteasy.test.feature.pack.version}</version>
<inherit-configs>false</inherit-configs>
</feature-pack>
</feature-packs>
</configuration>
</execution>
</executions>
</plugin>
Expand All @@ -111,6 +142,88 @@
<server.test.feature.pack.version>${version.org.wildfly}</server.test.feature.pack.version>
</properties>
</profile>
<profile>
<id>provision-without-resteasy</id>
<properties>
<jboss.home>${project.build.directory}${file.separator}wildfly</jboss.home>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<executions>
<execution>
<id>server-provisioning</id>
<phase>generate-test-resources</phase>
<goals>
<goal>provision</goal>
</goals>
<configuration>
<feature-packs>
<feature-pack>
<groupId>${server.test.feature.pack.groupId}</groupId>
<artifactId>${server.test.feature.pack.artifactId}</artifactId>
<version>${server.test.feature.pack.version}</version>
<inherit-configs>false</inherit-configs>
<included-configs>
<config>
<model>standalone</model>
<name>standalone-full.xml</name>
</config>
<config>
<model>standalone</model>
<name>standalone.xml</name>
</config>
</included-configs>
<excluded-packages>
<name>docs.schema</name>
<name>appclient</name>
<name>domain</name>
</excluded-packages>
</feature-pack>
</feature-packs>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>without-jackson</id>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
</excludes>
</configuration>
<executions>
<!-- default test execution -->
<execution>
<id>default-test</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<excludes>
<!-- Tests requires excluding JsonBindingProvider-->
<exclude>**/JaxbXmlRootElementProviderTest.java</exclude>
<exclude>**/JsonBindingAnnotationsJacksonTest.java</exclude>
<exclude>**/SseJsonEventTest</exclude>
<!-- The CustomJackson2Provider doesn't work with this if the full project is not built. -->
<exclude>**/CustomJackson2ProviderTest.java</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>skip.tracing.tests</id>
<activation>
Expand Down Expand Up @@ -451,52 +564,16 @@
</executions>
</plugin>
<plugin>
<groupId>org.jboss.galleon</groupId>
<artifactId>galleon-maven-plugin</artifactId>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<install-dir>${jboss.home}</install-dir>
<skip>${galleon.skip}</skip>
<record-state>false</record-state>
<log-time>${galleon.log.time}</log-time>
<provisioning-dir>${jboss.home}</provisioning-dir>
<skip>${wildfly.skip}</skip>
<offline>${galleon.offline}</offline>
<plugin-options>
<!--<jboss-maven-dist/> -->
<galleon-options>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
</plugin-options>
<feature-packs>
<feature-pack>
<groupId>${server.test.feature.pack.groupId}</groupId>
<artifactId>${server.test.feature.pack.artifactId}</artifactId>
<version>${server.test.feature.pack.version}</version>
<inherit-configs>false</inherit-configs>
<included-configs>
<config>
<model>standalone</model>
<name>standalone-full.xml</name>
</config>
<config>
<model>standalone</model>
<name>standalone.xml</name>
</config>
</included-configs>
<excluded-packages>
<name>docs.schema</name>
<name>appclient</name>
<name>domain</name>
</excluded-packages>
</feature-pack>
<feature-pack>
<groupId>${resteasy.test.feature.pack.groupId}</groupId>
<artifactId>${resteasy.test.feature.pack.artifactId}</artifactId>
<version>${resteasy.test.feature.pack.version}</version>
<inherit-configs>false</inherit-configs>
</feature-pack>
</feature-packs>
</galleon-options>
</configuration>
</plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<executions>
<execution>
<id>enable-elytron-full-cli</id>
Expand Down
1 change: 0 additions & 1 deletion testsuite/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,6 @@
</property>
</activation>
<properties>
<galleon.skip>true</galleon.skip>
<wildfly.skip>true</wildfly.skip>
</properties>
</profile>
Expand Down