Skip to content

Commit 27d6c5e

Browse files
committed
adjust workflows, java tests / make are separate
1 parent ca90e53 commit 27d6c5e

File tree

1 file changed

+24
-2
lines changed

1 file changed

+24
-2
lines changed

.github/workflows/pull_request.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ jobs:
4444
- name: Generate sources (make) (Temporary)
4545
# TODO: this should be triggered by the respective builds
4646
run: make jextract-run
47-
- name: Gradle build
48-
run: ./gradlew build --no-daemon
47+
- name: Gradle test
48+
run: ./gradlew test --no-daemon
4949

5050
test-swift:
5151
name: Swift tests (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
@@ -71,3 +71,25 @@ jobs:
7171
run: "make jextract-run"
7272
- name: Test Swift
7373
run: "swift test"
74+
75+
make:
76+
name: Make build (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
77+
runs-on: ubuntu-latest
78+
strategy:
79+
fail-fast: false
80+
matrix:
81+
swift_version: [ 'nightly-main' ]
82+
os_version: [ 'jammy' ]
83+
jdk_vendor: [ 'Corretto' ]
84+
container:
85+
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
86+
env:
87+
JAVA_HOME: "/usr/lib/jvm/default-jdk"
88+
steps:
89+
- uses: actions/checkout@v4
90+
- name: Install Make
91+
run: apt-get -qq update && apt-get -qq install -y make
92+
- name: Install JDK
93+
run: "bash -xc 'JDK_VENDOR=${{ matrix.jdk_vendor }} ./docker/install_jdk.sh'"
94+
- name: Make (default target)
95+
run: "make"

0 commit comments

Comments
 (0)