Skip to content

Commit 2827cb5

Browse files
committed
fix: shim installation in ci, shim failure message
Signed-off-by: Sam Gammon <[email protected]>
1 parent a5280c8 commit 2827cb5

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

.github/workflows/job.build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ jobs:
5656
run: cd ./example-project && elide install
5757
- name: "Setup: Dependencies (Remote Example)"
5858
run: cd ./example-project-remote && elide install
59+
- name: "Setup: Gradle Java Compiler Shim"
60+
run: cp -fv ./.github/workflows/shim.sh $JAVA_HOME/bin/elide-javac && chmod +x $JAVA_HOME/bin/elide-javac
5961
- name: "Build: Projects"
6062
run: ./gradlew --stacktrace --info --no-daemon build
6163
- name: "Build: Remote Example"

.github/workflows/shim.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env bash
2+
exec elide javac -- "$@"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Experimental plugin for using [Elide](https://github.com/elide-dev/elide) from w
88

99
**`$JAVA_HOME/bin/elide-javac`**
1010
```bash
11-
#!env bash
11+
#!/usr/bin/env bash
1212
exec elide javac -- "${@}"
1313
```
1414

elide-gradle-plugin/src/main/java/dev/elide/gradle/ElideGradlePlugin.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ private Task configureJavaCompileToUseElide(Project project, JavaCompile task, E
8181
// the shim is there and executable, so we can use it.
8282
resolvedElide = javaHomeShim;
8383
}
84+
if (resolvedElide == null) {
85+
project.getLogger().error("Failed to resolve Elide javac shim, and Java Home is not writable.");
86+
throw new RuntimeException("Failed to resolve Elide javac shim; is your Java Home writable?");
87+
}
8488
Objects.requireNonNull(resolvedElide);
8589
var pathAsString = resolvedElide.toString();
8690
var options = task.getOptions();

0 commit comments

Comments
 (0)