Skip to content
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
8 changes: 4 additions & 4 deletions .github/workflows/release_with_jars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
distribution: 'temurin'
java-version: '21'
cache: 'maven'
- name: Build java 8 version of Neqsim ${{ needs.get_versions.outputs.version_8 }} with Maven
- name: Build java 8 version of Neqsim ${{ needs.get_versions.outputs.version_8 }} with Maven, do not test
run: mvn -B package --file pomJava8.xml -DskipTests -Djacoco.skip=true -ntp
- name: Copy jar file to staging
run: mkdir staging && cp target/neqsim*Java8.jar staging
Expand All @@ -77,9 +77,9 @@ jobs:
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
cache: 'maven'
- name: Build java 17 version with Maven
- name: Build java 17 version with Maven, do not test
run: mvn -B package --file pom.xml -DskipTests -Djacoco.skip=true -ntp
- name: Copy jar file to staging
run: mkdir staging && cp target/neqsim*.jar staging
Expand All @@ -104,7 +104,7 @@ jobs:
distribution: 'temurin'
java-version: '21'
cache: 'maven'
- name: Install NeqSim core to local Maven repo
- name: Install NeqSim core to local Maven repo, do not test
run: mvn -B install -DskipTests -Dmaven.javadoc.skip=true -ntp
- name: Build MCP server uber-jar
run: |
Expand Down
64 changes: 39 additions & 25 deletions .github/workflows/verify_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ on:
- master

jobs:
test_java:
name: Assert tests and javadoc with Java 21 on Ubuntu
test_javadoc:
name: Assert javadoc with Java 21 on Ubuntu
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
Expand All @@ -29,9 +29,40 @@ jobs:
cache: 'maven'
- name: Generate javadoc
run: mvn javadoc:javadoc -ntp "-Daether.connector.basic.retries=5"

test_java_matrix:
name: Assert tests with Java 21 on ${{ matrix.platform }}
runs-on: ${{ matrix.os }}
needs: test_javadoc
strategy:
fail-fast: true
matrix:
include:
- platform: Ubuntu
os: ubuntu-latest
verify_jacoco: true
- platform: Windows
os: windows-latest
verify_jacoco: false
steps:
- uses: actions/checkout@v6
with:
token: ${{ github.token }}
fetch-depth: 1
- name: Set up Java 21 environment
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '21'
cache: 'maven'
- name: Run tests and generate JaCoCo report
run: mvn -B test --file pom.xml -ntp -DskipITs "-Daether.connector.basic.retries=5"
if: matrix.verify_jacoco
run: mvn -B test -ntp -DexcludedTestGroups= "-Daether.connector.basic.retries=5"
Comment thread
asmfstatoil marked this conversation as resolved.
- name: Run fast tests, do not generate JaCoCo report
if: ${{ !matrix.verify_jacoco }}
run: mvn -B test -ntp -DskipITs "-Daether.connector.basic.retries=5" "-Djacoco.skip=true"
- name: Verify JaCoCo report exists
if: matrix.verify_jacoco && github.event_name == 'push' && github.ref == 'refs/heads/master'
run: |
if [ -f target/site/jacoco/jacoco.xml ]; then
echo "JaCoCo report found"
Expand All @@ -45,7 +76,7 @@ jobs:
exit 1
fi
- name: Upload jacoco coverage reports to Codecov
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
if: matrix.verify_jacoco && github.event_name == 'push' && github.ref == 'refs/heads/master'
uses: codecov/codecov-action@v7
with:
files: target/site/jacoco/jacoco.xml
Expand All @@ -56,7 +87,7 @@ jobs:
test_java_8:
name: Assert tests with Java 8 on Ubuntu
runs-on: ubuntu-latest
needs: test_java
needs: test_java_matrix
steps:
- uses: actions/checkout@v6
with:
Expand All @@ -69,12 +100,12 @@ jobs:
java-version: '8'
cache: 'maven'
- name: Run tests
run: mvn -B test --file pomJava8.xml -ntp "-Daether.connector.basic.retries=5"
run: mvn -B test --file pomJava8.xml -ntp "-Daether.connector.basic.retries=5" -Djacoco.skip=true

test_java_8_windows:
name: Assert tests with Java 8 on Windows
runs-on: windows-latest
needs: test_java_windows
needs: test_java_matrix
steps:
- uses: actions/checkout@v6
with:
Expand All @@ -87,24 +118,7 @@ jobs:
java-version: '8'
cache: 'maven'
- name: Run tests
run: mvn -B test --file pomJava8.xml -ntp "-Daether.connector.basic.retries=5"

test_java_windows:
name: Assert tests with Java 21 on Windows
runs-on: windows-latest
steps:
- uses: actions/checkout@v6
with:
token: ${{ github.token }}
fetch-depth: 1
- name: Set up Java 21 environment
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '21'
cache: 'maven'
- name: Run tests
run: mvn -B test --file pom.xml -ntp "-Daether.connector.basic.retries=5"
run: mvn -B test --file pomJava8.xml -ntp "-Daether.connector.basic.retries=5" -Djacoco.skip=true

verify_agent_skills:
name: Verify agent-skill cross-references
Expand Down
Loading