Skip to content

Commit 09c28a8

Browse files
committed
ci: speed up armv7 tests
1 parent b76a491 commit 09c28a8

3 files changed

Lines changed: 12 additions & 14 deletions

File tree

.github/workflows/ci.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,18 @@ jobs:
122122
- name: Set MAVEN_OPTS armv7
123123
if: matrix.arch == 'armv7'
124124
run: echo "MAVEN_OPTS=-XX:+UseSerialGC -DforkCount=1 -DreuseForks=true -Dsurefire.parallel=methods -Dsurefire.threadCount=1 -Dsurefire.useUnlimitedThreads=false -Djdk.tls.client.cipherSuites=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA" >> $GITHUB_ENV
125+
- name: Set MAVEN_OPTS riscv64
126+
if: matrix.arch == 'riscv64'
127+
run: echo "MAVEN_OPTS=-DforkCount=2 -DreuseForks=true -Dsurefire.parallel=methods -Dsurefire.threadCount=1 -Dsurefire.useUnlimitedThreads=false" >> $GITHUB_ENV
128+
129+
- uses: actions/setup-java@v5
130+
with:
131+
distribution: 'temurin'
132+
java-version: ${{ matrix.java }}
133+
java-package: jdk
134+
cache: 'maven'
135+
- name: Pre compile
136+
run: mvn --batch-mode --no-transfer-progress install -DskipTests -am
125137
- uses: uraimo/run-on-arch-action@v3
126138
name: Test
127139
with:

src/test/java/org/sqlite/architecture/CodingRulesTest.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,9 @@
1919
import com.tngtech.archunit.lang.ArchRule;
2020
import com.tngtech.archunit.lang.conditions.ArchConditions;
2121
import java.sql.DriverManager;
22-
import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
23-
import org.junit.jupiter.api.condition.DisabledInNativeImage;
2422
import org.sqlite.util.LoggerFactory;
2523
import org.sqlite.util.OSInfo;
2624

27-
@DisabledIfEnvironmentVariable(
28-
named = "SKIP_TEST_MULTIARCH",
29-
matches = "true",
30-
disabledReason = "Those tests don't need to run in multi-arch")
31-
@DisabledInNativeImage
3225
@AnalyzeClasses(
3326
packages = "org.sqlite",
3427
importOptions = {ImportOption.DoNotIncludeTests.class})

src/test/java/org/sqlite/architecture/TestCodingRulesTest.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,7 @@
66
import com.tngtech.archunit.junit.AnalyzeClasses;
77
import com.tngtech.archunit.junit.ArchTest;
88
import com.tngtech.archunit.lang.ArchRule;
9-
import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
10-
import org.junit.jupiter.api.condition.DisabledInNativeImage;
119

12-
@DisabledIfEnvironmentVariable(
13-
named = "SKIP_TEST_MULTIARCH",
14-
matches = "true",
15-
disabledReason = "Those tests don't need to run in multi-arch")
16-
@DisabledInNativeImage
1710
@AnalyzeClasses(
1811
packages = "org.sqlite",
1912
importOptions = {ImportOption.OnlyIncludeTests.class})

0 commit comments

Comments
 (0)