diff --git a/docs/release_script.sh b/docs/release_script.sh index 84e69c6..e967879 100755 --- a/docs/release_script.sh +++ b/docs/release_script.sh @@ -129,7 +129,7 @@ mkdir -p "$basedir/.gradle" releasenotes="$basedir/.gradle/releasenotes.md" echo Building release notes -echo "**Full Changelog**: https://github.com/nea89o/Firmament/compare/$oldversion...$newversion" > "$releasenotes" +echo "**Full Changelog**: " > "$releasenotes" echo >> "$releasenotes" git log --pretty='- %s' --grep '[no changelog]' --invert-grep --fixed-strings "$oldversion..$newversion" | tac >> "$releasenotes" echo >> "$releasenotes" @@ -142,6 +142,7 @@ echo Press Enter to resume read echo Building JAR +"$basedir"/gradlew --stop "$basedir"/gradlew clean build echo Release notes: diff --git a/shell.nix b/shell.nix index 865c75c..dbbeb28 100644 --- a/shell.nix +++ b/shell.nix @@ -11,10 +11,12 @@ pkgs.mkShell { reuse pre-commit glfw + jdk21 libGL ]; shellHook = '' export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pkgs.glfw}/lib" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pkgs.libGL}/lib" + export JAVA_HOME=${pkgs.jdk21} ''; }