Skip to content

Commit 68c1b96

Browse files
committed
ci: speed up armv7 tests
1 parent aee62fc commit 68c1b96

3 files changed

Lines changed: 20 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,12 @@ jobs:
116116
runs-on: ubuntu-latest
117117
steps:
118118
- uses: actions/checkout@v6
119-
- name: Set MAVEN_OPTS
120-
if: matrix.arch == 'armv7' || matrix.arch == 'ppc64le'
121-
run: |
122-
echo "MAVEN_OPTS=-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
119+
- name: Set MAVEN_OPTS ppc64le
120+
if: matrix.arch == 'ppc64le'
121+
run: echo "MAVEN_OPTS=-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
122+
- name: Set MAVEN_OPTS armv7
123+
if: matrix.arch == 'armv7'
124+
run: echo "MAVEN_OPTS=-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
123125
- uses: uraimo/run-on-arch-action@v3
124126
name: Test
125127
with:

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,16 @@
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;
2224
import org.sqlite.util.LoggerFactory;
2325
import org.sqlite.util.OSInfo;
2426

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

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@
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;
911

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

0 commit comments

Comments
 (0)