Skip to content

Commit 0f60bff

Browse files
ktosoktoso
committed
Disable test on linux/amd64 until we figure it out, in meantime it works on arm macs
1 parent db8fc4f commit 0f60bff

File tree

7 files changed

+101
-92
lines changed

7 files changed

+101
-92
lines changed

‎.github/workflows/pull_request.yml

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ on:
55
types: [opened, reopened, synchronize]
66

77
jobs:
8-
# soundness:
9-
# uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
10-
# with:
11-
# api_breakage_check_enabled: false
12-
# # FIXME: Something is off with the format task and it gets "stuck", need to investigate
13-
# format_check_enabled: false
14-
# license_header_check_project_name: Swift.org
8+
soundness:
9+
uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
10+
with:
11+
api_breakage_check_enabled: false
12+
# FIXME: Something is off with the format task and it gets "stuck", need to investigate
13+
format_check_enabled: false
14+
license_header_check_project_name: Swift.org
1515

1616
test-java:
1717
name: Java tests (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
@@ -62,53 +62,53 @@ jobs:
6262
find .
6363
./gradlew build --info --no-daemon
6464
65-
# test-swift:
66-
# name: Swift tests (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
67-
# runs-on: ubuntu-latest
68-
# strategy:
69-
# fail-fast: false
70-
# matrix:
71-
# swift_version: ['nightly-main']
72-
# os_version: ['jammy']
73-
# jdk_vendor: ['Corretto']
74-
# container:
75-
# image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
76-
# env:
77-
# JAVA_HOME: "/usr/lib/jvm/default-jdk"
78-
# steps:
79-
# - uses: actions/checkout@v4
80-
# - name: Install System Dependencies
81-
# run: apt-get -qq update && apt-get -qq install -y make curl wget
82-
# - name: Install JDK
83-
# run: "bash -xc 'JDK_VENDOR=${{ matrix.jdk_vendor }} ./docker/install_jdk.sh'"
84-
# - name: Install Untested Nightly Swift
85-
# run: "bash -xc './docker/install_untested_nightly_swift.sh'"
86-
# # setup caches
87-
# - name: Cache local Gradle repository
88-
# uses: actions/cache@v4
89-
# continue-on-error: true
90-
# with:
91-
# path: |
92-
# /root/.gradle/caches
93-
# /root/.gradle/wrapper
94-
# key: ${{ runner.os }}-gradle-${{ hashFiles('*/*.gradle*', 'settings.gradle') }}
95-
# restore-keys: |
96-
# ${{ runner.os }}-gradle-
97-
# - name: Cache local SwiftPM repository
98-
# uses: actions/cache@v4
99-
# continue-on-error: true
100-
# with:
101-
# path: /__w/swift-java/swift-java/.build/checkouts
102-
# key: ${{ runner.os }}-swiftpm-cache-${{ hashFiles('Package.swift') }}
103-
# restore-keys: |
104-
# ${{ runner.os }}-swiftpm-cache
105-
# ${{ runner.os }}-swiftpm-
106-
# # run the actual build
107-
# - name: Generate sources (make) (Temporary)
108-
# # TODO: this should be triggered by the respective builds
109-
# run: "make jextract-generate"
110-
# - name: Test Swift
111-
# run: "swift test"
112-
# - name: Build (Swift) Sample Apps
113-
# run: |
114-
# find Samples/ -name Package.swift -maxdepth 2 -exec swift build --package-path $(dirname {}) \;;
65+
test-swift:
66+
name: Swift tests (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
67+
runs-on: ubuntu-latest
68+
strategy:
69+
fail-fast: false
70+
matrix:
71+
swift_version: ['nightly-main']
72+
os_version: ['jammy']
73+
jdk_vendor: ['Corretto']
74+
container:
75+
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
76+
env:
77+
JAVA_HOME: "/usr/lib/jvm/default-jdk"
78+
steps:
79+
- uses: actions/checkout@v4
80+
- name: Install System Dependencies
81+
run: apt-get -qq update && apt-get -qq install -y make curl wget
82+
- name: Install JDK
83+
run: "bash -xc 'JDK_VENDOR=${{ matrix.jdk_vendor }} ./docker/install_jdk.sh'"
84+
- name: Install Untested Nightly Swift
85+
run: "bash -xc './docker/install_untested_nightly_swift.sh'"
86+
# setup caches
87+
- name: Cache local Gradle repository
88+
uses: actions/cache@v4
89+
continue-on-error: true
90+
with:
91+
path: |
92+
/root/.gradle/caches
93+
/root/.gradle/wrapper
94+
key: ${{ runner.os }}-gradle-${{ hashFiles('*/*.gradle*', 'settings.gradle') }}
95+
restore-keys: |
96+
${{ runner.os }}-gradle-
97+
- name: Cache local SwiftPM repository
98+
uses: actions/cache@v4
99+
continue-on-error: true
100+
with:
101+
path: /__w/swift-java/swift-java/.build/checkouts
102+
key: ${{ runner.os }}-swiftpm-cache-${{ hashFiles('Package.swift') }}
103+
restore-keys: |
104+
${{ runner.os }}-swiftpm-cache
105+
${{ runner.os }}-swiftpm-
106+
# run the actual build
107+
- name: Generate sources (make) (Temporary)
108+
# TODO: this should be triggered by the respective builds
109+
run: "make jextract-generate"
110+
- name: Test Swift
111+
run: "swift test"
112+
- name: Build (Swift) Sample Apps
113+
run: |
114+
find Samples/ -name Package.swift -maxdepth 2 -exec swift build --package-path $(dirname {}) \;;

‎Samples/SwiftKitSampleApp/src/main/java/com/example/swift/HelloJava2Swift.java

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package com.example.swift;
1616

1717
// Import swift-extract generated sources
18+
import com.example.swift.generated.ExampleSwiftLibrary;
1819
import com.example.swift.generated.MySwiftClass;
1920

2021
// Import javakit/swiftkit support libraries
@@ -36,33 +37,17 @@ public static void main(String[] args) {
3637
}
3738

3839
static void examples() {
39-
// ExampleSwiftLibrary.helloWorld();
40-
//
41-
// ExampleSwiftLibrary.globalTakeInt(1337);
42-
//
43-
// MySwiftClass obj = new MySwiftClass(2222, 7777);
44-
//
45-
// SwiftKit.retain(obj.$memorySegment());
46-
// System.out.println("[java] obj ref count = " + SwiftKit.retainCount(obj.$memorySegment()));
47-
//
48-
// obj.voidMethod();
49-
// obj.takeIntMethod(42);
50-
51-
MySwiftClass unsafelyEscaped = null;
52-
try (var arena = SwiftArena.ofConfined()) {
53-
var instance = new MySwiftClass(arena, 1111, 2222);
54-
unsafelyEscaped = instance;
40+
ExampleSwiftLibrary.helloWorld();
5541

56-
// var num = instance.makeIntMethod();
42+
ExampleSwiftLibrary.globalTakeInt(1337);
5743

58-
System.out.println("SwiftKit.retainCount(instance) = " + SwiftKit.retainCount(instance));
44+
MySwiftClass obj = new MySwiftClass(2222, 7777);
5945

60-
System.out.println("MySwiftClass.TYPE_MANGLED_NAME = " + MySwiftClass.TYPE_MANGLED_NAME);
61-
MemorySegment typeMetadata = SwiftValueWitnessTable.fullTypeMetadata(MySwiftClass.TYPE_METADATA.$memorySegment());
62-
System.out.println("typeMetadata = " + typeMetadata);
63-
} // instance should be deallocated
46+
SwiftKit.retain(obj.$memorySegment());
47+
System.out.println("[java] obj ref count = " + SwiftKit.retainCount(obj.$memorySegment()));
6448

65-
var num = unsafelyEscaped.makeIntMethod();
49+
obj.voidMethod();
50+
obj.takeIntMethod(42);
6651

6752
System.out.println("DONE.");
6853
}

‎Samples/SwiftKitSampleApp/src/test/java/org/swift/swiftkit/SwiftArenaTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
import com.example.swift.generated.MySwiftClass;
1818
import org.junit.jupiter.api.BeforeAll;
1919
import org.junit.jupiter.api.Test;
20+
import org.junit.jupiter.api.condition.DisabledIf;
21+
import org.swift.swiftkit.util.PlatformUtils;
2022

2123
import static org.junit.jupiter.api.Assertions.*;
2224
import static org.swift.swiftkit.SwiftKit.*;
@@ -30,7 +32,14 @@ static void beforeAll() {
3032
System.out.printf("jextract.trace.downcalls = %s\n", SwiftKit.getJextractTraceDowncalls());
3133
}
3234

35+
static boolean isAmd64() {
36+
return PlatformUtils.isAmd64();
37+
}
38+
39+
// FIXME: The destroy witness table call hangs on x86_64 platforms during the destroy witness table call
40+
// See: https://github.com/swiftlang/swift-java/issues/97
3341
@Test
42+
@DisabledIf("isAmd64")
3443
public void arena_releaseClassOnClose_class_ok() {
3544
try (var arena = SwiftArena.ofConfined()) {
3645
var obj = new MySwiftClass(arena,1, 2);

‎SwiftKit/src/main/java/org/swift/swiftkit/SwiftValueLayout.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
import java.lang.foreign.MemoryLayout;
1919
import java.lang.foreign.ValueLayout;
2020

21-
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
22-
import static java.lang.foreign.ValueLayout.JAVA_LONG;
21+
import static java.lang.foreign.ValueLayout.*;
2322

2423
/**
2524
* Similar to {@link java.lang.foreign.ValueLayout} however with some Swift specifics.

‎SwiftKit/src/main/java/org/swift/swiftkit/SwiftValueWitnessTable.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ public static MemorySegment fullTypeMetadata(MemorySegment typeMetadata) {
7070
*/
7171
public static MemorySegment valueWitnessTable(MemorySegment typeMetadata) {
7272
return fullTypeMetadata(typeMetadata)
73-
.get(SwiftValueLayout.SWIFT_POINTER, SwiftValueWitnessTable.fullTypeMetadata$vwt$offset);
73+
.get(SwiftValueLayout.SWIFT_POINTER, SwiftValueWitnessTable.fullTypeMetadata$vwt$offset);
74+
// .get(ValueLayout.ADDRESS, SwiftValueWitnessTable.fullTypeMetadata$vwt$offset);
7475
}
7576

7677

@@ -209,9 +210,7 @@ static MethodHandle handle(SwiftAnyType ty) {
209210
*/
210211
public static void destroy(SwiftAnyType type, MemorySegment object) {
211212
var fullTypeMetadata = fullTypeMetadata(type.$memorySegment());
212-
System.out.println("fullTypeMetadata = " + fullTypeMetadata);
213213
var wtable = valueWitnessTable(fullTypeMetadata);
214-
System.out.println("wtable = " + wtable);
215214

216215
var mh = destroy.handle(type);
217216

‎SwiftKit/src/main/java/org/swift/swiftkit/util/PlatformUtils.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,13 @@ public static boolean isMacOS() {
2626
public static boolean isWindows() {
2727
return System.getProperty("os.name").toLowerCase().contains("windows");
2828
}
29+
30+
public static boolean isAarch64() {
31+
return System.getProperty("os.arch").equals("aarm64");
32+
}
33+
34+
public static boolean isAmd64() {
35+
String arch = System.getProperty("os.arch");
36+
return arch.equals("amd64") || arch.equals("x86_64");
37+
}
2938
}

‎buildSrc/src/main/groovy/org/swift/swiftkit/gradle/BuildUtils.groovy

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,28 @@ final class BuildUtils {
2121
def osName = System.getProperty("os.name")
2222
def osArch = System.getProperty("os.arch")
2323
def isLinux = osName.toLowerCase(Locale.getDefault()).contains("linux")
24+
def base = rootDir == null ? "" : "${rootDir}/"
25+
System.out.println("Root dir is = ${rootDir}")
2426

2527
return [
2628
isLinux ?
27-
/* Linux */(osArch == "amd64" || osArch == "amd64" ?
28-
"${rootDir}/.build/x86_64-unknown-linux-gnu/debug/" :
29-
"${rootDir}/.build/${osArch}-unknown-linux-gnu/debug/") :
30-
/* macOS */(osArch == "aarch64" ?
31-
"${rootDir}/.build/arm64-apple-macosx/debug/" :
32-
"${rootDir}/.build/${osArch}-apple-macosx/debug/"),
29+
/* Linux */ (osArch == "amd64" || osArch == "x86_64" ?
30+
"${base}.build/x86_64-unknown-linux-gnu/debug/" :
31+
"${base}.build/${osArch}-unknown-linux-gnu/debug/") :
32+
/* macOS */ (osArch == "aarch64" ?
33+
"${base}.build/arm64-apple-macosx/debug/" :
34+
"${base}.build/${osArch}-apple-macosx/debug/"),
35+
isLinux ?
36+
/* Linux */ (osArch == "amd64" || osArch == "x86_64" ?
37+
"${base}../../.build/x86_64-unknown-linux-gnu/debug/" :
38+
"${base}../../.build/${osArch}-unknown-linux-gnu/debug/") :
39+
/* macOS */ (osArch == "aarch64" ?
40+
"${base}../../.build/arm64-apple-macosx/debug/" :
41+
"${base}../../.build/${osArch}-apple-macosx/debug/"),
3342
isLinux ?
3443
"/usr/lib/swift/linux" :
3544
// assume macOS
3645
"/usr/lib/swift/"
3746
]
3847
}
39-
4048
}

0 commit comments

Comments
 (0)