Skip to content

Commit cbdc7d0

Browse files
authored
Merge branch 'main' into wip-workflow-experiment
2 parents 674df21 + 9965173 commit cbdc7d0

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

.github/workflows/pull_request.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,17 @@ jobs:
3030
- uses: actions/checkout@v4
3131
- name: Install System Dependencies
3232
run: apt-get -qq update && apt-get -qq install -y make curl wget
33+
- name: Cache JDK
34+
id: cache-jdk
35+
uses: actions/cache@v4
36+
continue-on-error: true
37+
with:
38+
path: /usr/lib/jvm/default-jdk/
39+
key: ${{ runner.os }}-jdk-${{ matrix.jdk_vendor }}-${{ hashFiles('/usr/lib/jvm/default-jdk/*') }}
40+
restore-keys: |
41+
${{ runner.os }}-jdk-
3342
- name: Install JDK
43+
if: steps.cache-jdk.outputs.cache-hit != 'true'
3444
run: "bash -xc 'JDK_VENDOR=${{ matrix.jdk_vendor }} ./docker/install_jdk.sh'"
3545
# TODO: not using setup-java since incompatible with the swiftlang/swift base image
3646
- name: Install Untested Nightly Swift

SwiftKit/src/main/java/org/swift/swiftkit/MemorySegmentUtils.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@ static void setSwiftPointerAddress(MemorySegment target, MemorySegment memorySeg
2929
// Write the address of as the value of the newly created pointer.
3030
// We need to type-safely set the pointer value which may be 64 or 32-bit.
3131
if (SwiftValueLayout.SWIFT_INT == ValueLayout.JAVA_LONG) {
32-
System.out.println("[setSwiftPointerAddress] address is long = " + memorySegment.address());
3332
target.set(ValueLayout.JAVA_LONG, /*offset=*/0, memorySegment.address());
3433
} else {
35-
System.out.println("[setSwiftPointerAddress] address is int = " + memorySegment.address());
3634
target.set(ValueLayout.JAVA_INT, /*offset=*/0, (int) memorySegment.address());
3735
}
3836
}

0 commit comments

Comments
 (0)