Skip to content

Commit

Permalink
Merge pull request #131 from zero88/improvement/try-matrix-build
Browse files Browse the repository at this point in the history
chore(build): add matrix build
  • Loading branch information
zero88 authored Mar 21, 2024
2 parents 427dc7f + 8bd6229 commit 1551bd5
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,17 @@ jobs:
uses: zero88/shared-ghactions/.github/workflows/gradle-build.yml@main
needs: context
if: needs.context.outputs.shouldBuild == 'true'
strategy:
matrix:
java: [ '11', '17', '21' ]
os: [ 'ubuntu-latest', 'windows-latest' ]
fail-fast: false
name: With Java-${{ matrix.java }} on ${{ matrix.os }}
with:
profile: 'ciBuild'
version: ${{ needs.context.outputs.version }}
semanticVersion: ${{ needs.context.outputs.semanticVersion }}
hashVersion: ${{ needs.context.outputs.commitId }}
buildArgs: 'clean build -x test'

docs:
uses: zero88/shared-ghactions/.github/workflows/antora-docs.yml@main
Expand Down Expand Up @@ -86,7 +91,6 @@ jobs:
profile: 'ciSonar'
semanticVersion: ${{ needs.context.outputs.semanticVersion }}
branch: ${{ needs.context.outputs.branch }}
javaVersion: '17'
secrets:
githubToken: ${{ secrets.OSS_GITHUB_TOKEN }}
sonarToken: ${{ secrets.OSS_SONARQUBE_TOKEN }}
Expand Down
3 changes: 3 additions & 0 deletions .sdkmanrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
java=11.0.22-tem
6 changes: 1 addition & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ project.ext.set("baseName", (gradle as ExtensionAware).extensions["BASE_NAME"] a
project.ext.set(NexusConfig.NEXUS_VERSION_KEY, NexusVersion.BEFORE_2021_02_24)

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
}

allprojects {
Expand Down Expand Up @@ -53,9 +52,6 @@ subprojects {
oss {
zero88.set(true)
github.set(true)
publishing {
homepage.set("https://github.com/zero88/scheduler.x")
}
testLogger {
slowThreshold = 7000
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.junitpioneer.jupiter.RetryingTest;

import io.github.zero88.schedulerx.trigger.IntervalTrigger;
import io.vertx.core.Vertx;
Expand Down Expand Up @@ -122,7 +123,7 @@ void test_job_should_be_executed_in_interval_trigger_after_delay(Vertx vertx, Ve
.start();
}

@Test
@RetryingTest(3)
void test_run_blocking_job_till_the_end(Vertx vertx, VertxTestContext testContext) {
final Checkpoint flag = testContext.checkpoint(4);
final AtomicLong lastTickOnEach = new AtomicLong();
Expand Down

0 comments on commit 1551bd5

Please sign in to comment.