Skip to content
This repository was archived by the owner on Apr 10, 2024. It is now read-only.

Commit 8b8ddd6

Browse files
authored
feat: using amd64 bins only (#21)
1 parent f3e493f commit 8b8ddd6

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

.github/workflows/pr.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ jobs:
1616
check_format_and_tests:
1717
strategy:
1818
matrix:
19-
# macos-latest-xl -> not yet available (just part as a plan?)
20-
# macos-latest -> is not amd64 (but x86) that is not supported
21-
os: [ ubuntu-latest, windows-latest ]
19+
os: [ ubuntu-latest, windows-latest, macos-latest ]
2220
runs-on: ${{ matrix.os }}
2321
steps:
2422
- uses: actions/checkout@v3

src/main/java/com/csviri/jenvtest/Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static void redirectProcessOutputToLogger(InputStream outputStream, Logge
4242
new Thread(() -> {
4343
Scanner sc = new Scanner(outputStream);
4444
while (sc.hasNextLine()) {
45-
logger.trace(sc.nextLine());
45+
logger.debug(sc.nextLine());
4646
}
4747
}).start();
4848
}

src/main/java/com/csviri/jenvtest/binary/OSInfo.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,18 @@ public String getOSName() {
1313
}
1414
}
1515

16+
/**
17+
* Only amd64 and ppc64 binaries available.
18+
*
19+
* @return ppc64le if on that architecture otherwise amd64.
20+
*/
1621
public String getOSArch() {
17-
return System.getProperty("os.arch").toLowerCase();
22+
var osArch = System.getProperty("os.arch").toLowerCase();
23+
if (osArch.contains("ppc64")) {
24+
return "ppc64le";
25+
} else {
26+
return "amd64";
27+
}
1828
}
1929

20-
2130
}

src/main/java/com/csviri/jenvtest/process/KubeAPIServerProcess.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void waitUntilDefaultNamespaceCreated() {
8989
procWaiter.start();
9090
procWaiter.join(KubeAPIServer.STARTUP_TIMEOUT);
9191
if (!started.get()) {
92-
throw new JenvtestException("API Server did not start properly. Check the log files.");
92+
throw new JenvtestException("API Server did not start properly");
9393
}
9494
} catch (IOException e) {
9595
throw new JenvtestException(e);

0 commit comments

Comments
 (0)