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.

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

Update CI to run less jobs and cleaner #414

Merged
merged 3 commits into from
Nov 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 36 additions & 43 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,17 @@ on:
push:
branches-ignore:
- 'dependabot/**'
paths-ignore:
- '.gitignore'
- "CODEOWNERS"
- "CODE_OF_CONDUCT.md"
- "CONTRIBUTING.adoc"
- "dco.txt"
- "LICENSE.txt"
- "README.md"
- "security.txt"
paths:
- 'core/**'
- 'plugin/**'
- 'tests/**'
- '**/pom.xml'
pull_request:
paths-ignore:
- '.gitignore'
- "CODEOWNERS"
- "CODE_OF_CONDUCT.md"
- "CONTRIBUTING.adoc"
- "dco.txt"
- "LICENSE.txt"
- "README.md"
- "security.txt"
paths:
- 'core/**'
- 'plugin/**'
- 'tests/**'
- '**/pom.xml'

# Only run the latest job
concurrency:
Expand All @@ -34,15 +26,32 @@ concurrency:


jobs:

format-check:
runs-on: ubuntu-latest
timeout-minutes: 30

steps:
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: 11
distribution: 'temurin'
cache: 'maven'
- name: Validate Formatting
run: |
mvn -B validate -Pformat-check -Denforcer.skip=true

build:
name: ${{ matrix.os }}-jdk${{ matrix.java }}-${{ matrix.wildfly-version }}
needs: format-check
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest ]
java: ['11', '17']
wildfly-version: ['26.1.3.Final', '27.0.1.Final']
java: ['11', '17', '21']

steps:
- uses: actions/checkout@v4
Expand All @@ -53,38 +62,22 @@ jobs:
cache: 'maven'
distribution: 'temurin'
- name: Build and Test on ${{ matrix.java }} - ${{ matrix.wildfly-version }}
run: mvn clean install '-Dorg.jboss.logmanager.nocolor=true' '-Dversion.org.wildfly=${{ matrix.wildfly-version }}'
run: mvn clean install '-Dorg.jboss.logmanager.nocolor=true'
- name: Upload surefire logs for failed run
uses: actions/upload-artifact@v3
if: failure()
with:
name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.wildfly-version }}
path: '**/surefire-reports/*.txt'
name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}
path: '**/surefire-reports/'
- name: Upload failsafe logs for failed run
uses: actions/upload-artifact@v3
if: failure()
with:
name: failsafe-reports-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.wildfly-version }}
path: '**/failsafe-reports/*.txt'
name: failsafe-reports-${{ matrix.os }}-${{ matrix.java }}
path: '**/failsafe-reports/'
- name: Upload logs for failed run
uses: actions/upload-artifact@v3
if: failure()
with:
name: server-logs-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.wildfly-version }}
path: '**/*.log'

format-check:
runs-on: ubuntu-latest
timeout-minutes: 30

steps:
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: 11
distribution: 'temurin'
cache: 'maven'
- name: Validate Formatting
run: |
mvn -B validate -Pformat-check -Denforcer.skip=true
name: server-logs-${{ matrix.os }}-${{ matrix.java }}
path: '**/*.log'
59 changes: 59 additions & 0 deletions .github/workflows/legacy-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: WildFly Maven Plugin Legacy Tests

on:
push:
branches-ignore:
- 'dependabot/**'
paths:
- 'core/**'
- 'plugin/**'
- 'tests/**'
- '**/pom.xml'

# Only run the latest job
concurrency:
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
cancel-in-progress: true


jobs:
legacy-build:
name: legacy-jdk${{ matrix.java }}-${{ matrix.wildfly-version }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
java: ['11']
wildfly-version: ['26.1.3.Final', '27.0.1.Final']

steps:
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
cache: 'maven'
distribution: 'temurin'
- name: Build and Test on ${{ matrix.java }} - ${{ matrix.wildfly-version }}
run: mvn clean install '-Dorg.jboss.logmanager.nocolor=true' '-Dversion.org.wildfly=${{ matrix.wildfly-version }}'
- name: Upload surefire logs for failed run
uses: actions/upload-artifact@v3
if: failure()
with:
name: surefire-reports-${{ matrix.java }}-${{ matrix.wildfly-version }}
path: '**/surefire-reports/'
- name: Upload failsafe logs for failed run
uses: actions/upload-artifact@v3
if: failure()
with:
name: failsafe-reports-${{ matrix.java }}-${{ matrix.wildfly-version }}
path: '**/failsafe-reports/'
- name: Upload logs for failed run
uses: actions/upload-artifact@v3
if: failure()
with:
name: server-logs-${{ matrix.java }}-${{ matrix.wildfly-version }}
path: '**/*.log'
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<version.org.wildfly.common.wildfly-common>1.6.0.Final</version.org.wildfly.common.wildfly-common>
<!-- This version property is also retrieved by plugin at runtime to resolve CLI artifact -->
<version.org.wildfly.core>22.0.1.Final</version.org.wildfly.core>
<version.org.wildfly>27.0.1.Final</version.org.wildfly>
<version.org.wildfly>30.0.0.Final</version.org.wildfly>
<version.org.wildfly.channel>1.0.5.Final</version.org.wildfly.channel>
<version.org.wildfly.prospero>1.2.0.Final</version.org.wildfly.prospero>
<!-- maven dependencies -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,12 @@

import org.apache.maven.plugin.Mojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
import org.wildfly.plugin.tests.AbstractProvisionConfiguredMojoTestCase;
import org.wildfly.plugin.tests.AbstractWildFlyMojoTest;
import org.wildfly.plugin.tests.TestEnvironment;

public class ImageTest extends AbstractProvisionConfiguredMojoTestCase {

Expand All @@ -49,6 +51,7 @@ public static void checkDockerInstallation() {

@Test
public void testBuildImage() throws Exception {
Assume.assumeFalse("This test is flaky on Windows, ignore it on Windows.", TestEnvironment.isWindows());
final String binary = ExecUtil.resolveImageBinary();
try {
assertTrue(
Expand Down