Skip to content

Commit b008a20

Browse files
authored
Merge pull request #217 from kbase/sdkdev
Fix MacOS x64 builds + TODO / typo cleanup
2 parents 6f995c8 + 180d2c6 commit b008a20

4 files changed

Lines changed: 4 additions & 10 deletions

File tree

.github/workflows/native_binary_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
label: linux-x64
2727
- os: macos-14
2828
label: macos-arm64
29-
- os: macos-13
29+
- os: macos-15-intel
3030
label: macos-x64
3131

3232
runs-on: ${{ matrix.os }}

.github/workflows/native_binary_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
label: linux-x64
1919
- os: macos-14
2020
label: macos-arm64
21-
- os: macos-13
21+
- os: macos-15-intel
2222
label: macos-x64
2323

2424
runs-on: ${{ matrix.os }}

build.gradle

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,11 @@ plugins {
55
id 'org.graalvm.buildtools.native' version '0.10.6'
66
}
77

8-
// TODO BUILD look into GraalVM native compilation vs. dockerizing kb-sdk
9-
// https://github.com/oracle/graal/issues/407#issuecomment-2573704305
10-
// TODO GENSCRIPT need to update genscript if we don't switch to GraalVM. Need to release to get
11-
// a latest tag
128

139
// TODO TEST DEPS TypeGeneratorTest has a hard coded list of jars it uses for tests
1410
// Need to figure out a better way
1511
// TODO TEST add a test that starts the SDK in a docker container and checks some simple cmds
16-
// TODO DEPS make JitPack jars for catalog and NMS and use them
17-
18-
// TODO CODE move all code under us.kbase.sdk
12+
// EDIT - run against the kb-sdk+ binary
1913

2014
group = 'us.kbase.sdk'
2115

src/main/java/us/kbase/sdk/callback/CallbackServerManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class CallbackServerManager implements AutoCloseable {
6060
* @param workDirRoot the working directory for the callback server. This directory will
6161
* be mounted into the server. Any files outside of this directory will not be visible to
6262
* the server. The callback server will write output here.
63-
* @param kbaseBaseUrl the base URL for contacting kBase services,
63+
* @param kbaseBaseUrl the base URL for contacting KBase services,
6464
* e.g. "https://ci.kbase.us/services/"
6565
* @param token the user's KBase token for contacting KBase services.
6666
* @param prov initial provenance for the callback server.

0 commit comments

Comments
 (0)