Skip to content

Commit 8842a5a

Browse files
committed
ci: more simple way to get macOS running, reusable workflows facing some
issues
1 parent df03e23 commit 8842a5a

File tree

1 file changed

+70
-0
lines changed

1 file changed

+70
-0
lines changed

.github/workflows/pull_request.yml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,29 @@ jobs:
3939
- name: Gradle compile JMH benchmarks
4040
run: ./gradlew compileJmh --info
4141

42+
test-java-macos:
43+
name: Java tests (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
44+
runs-on: [self-hosted, macos, sequoia, ARM64]
45+
strategy:
46+
fail-fast: true
47+
matrix:
48+
swift_version: ['6.1.2']
49+
os_version: ['macos']
50+
jdk_vendor: ['Corretto']
51+
env:
52+
JAVA_HOME: "/usr/lib/jvm/default-jdk"
53+
SWIFT_JAVA_VERBOSE: true
54+
steps:
55+
- uses: actions/checkout@v4
56+
- name: Prepare CI Environment
57+
uses: ./.github/actions/prepare_env
58+
- name: Gradle :SwiftKit:build
59+
run: ./gradlew build -x test
60+
- name: Gradle :SwiftKit:check
61+
run: ./gradlew :SwiftKit:check --debug
62+
- name: Gradle compile JMH benchmarks
63+
run: ./gradlew compileJmh --info
64+
4265
test-swift:
4366
name: Swift tests (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
4467
runs-on: ubuntu-latest
@@ -62,6 +85,27 @@ jobs:
6285
- name: Swift Test
6386
run: "swift test"
6487

88+
test-swift-macos:
89+
name: Swift tests (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
90+
runs-on: [self-hosted, macos, sequoia, ARM64]
91+
strategy:
92+
fail-fast: false
93+
matrix:
94+
swift_version: ['6.1.2']
95+
os_version: ['macos']
96+
jdk_vendor: ['Corretto']
97+
env:
98+
JAVA_HOME: "/usr/lib/jvm/default-jdk"
99+
SWIFT_JAVA_VERBOSE: true
100+
steps:
101+
- uses: actions/checkout@v4
102+
- name: Prepare CI Environment
103+
uses: ./.github/actions/prepare_env
104+
- name: Swift Build
105+
run: "swift build --build-tests --disable-sandbox"
106+
- name: Swift Test
107+
run: "swift test"
108+
65109
verify-samples:
66110
name: Verify Sample ${{ matrix.sample_app }} (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
67111
runs-on: ubuntu-latest
@@ -89,3 +133,29 @@ jobs:
89133
uses: ./.github/actions/prepare_env
90134
- name: "Verify sample"
91135
run: .github/scripts/validate_sample.sh Samples/${{ matrix.sample_app }}
136+
137+
verify-samples-macos:
138+
name: Verify Sample ${{ matrix.sample_app }} (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
139+
runs-on: [self-hosted, macos, sequoia, ARM64]
140+
strategy:
141+
fail-fast: false
142+
matrix:
143+
swift_version: ['6.1.2']
144+
os_version: ['sequoia']
145+
jdk_vendor: ['Corretto']
146+
sample_app: [
147+
'JavaDependencySampleApp',
148+
'JavaKitSampleApp',
149+
'JavaProbablyPrime',
150+
'JavaSieve',
151+
'SwiftAndJavaJarSampleLib',
152+
'SwiftKitSampleApp',
153+
]
154+
env:
155+
JAVA_HOME: "/usr/lib/jvm/default-jdk"
156+
steps:
157+
- uses: actions/checkout@v4
158+
- name: Prepare CI Environment
159+
uses: ./.github/actions/prepare_env
160+
- name: "Verify sample"
161+
run: .github/scripts/validate_sample.sh Samples/${{ matrix.sample_app }}

0 commit comments

Comments
 (0)