From abad5ae933e0c3e4d7a168dc094cb2f7f48fb8ae Mon Sep 17 00:00:00 2001 From: Kevin harrington Date: Mon, 29 Jul 2024 10:42:27 -0400 Subject: [PATCH] making a build script and fixing the deps --- .github/workflows/release.yml | 9 +-------- .github/workflows/verify.yml | 14 +------------- build.gradle | 4 ++-- makeJar.sh | 19 +++++++++++++++++++ 4 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 makeJar.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c59fb05d1..9400df575 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,15 +53,8 @@ jobs: - name: After JDK download, list directory contnts run: pwd; ls -la - - name: Set Java - uses: actions/setup-java@v1 - with: - java-version: 1.8 - jdkFile: ./zulu8.44.0.13-ca-fx-jdk8.0.242-linux_x64.tar.gz - - - name: Build with Gradle - run: ./gradlew shadowJar + run: bash makeJar.sh - name: release uses: actions/create-release@v1 diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 8f05f24b6..2d14a5276 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -35,17 +35,5 @@ jobs: - name: After checkout, list directory contnts run: pwd; ls -la - - name: Pull a JavaFX JDK - run: wget http://static.azul.com/zulu/bin/zulu8.44.0.13-ca-fx-jdk8.0.242-linux_x64.tar.gz - - - name: After JDK download, list directory contnts - run: pwd; ls -la - - - name: Set Java - uses: actions/setup-java@v1 - with: - java-version: 1.8 - jdkFile: ./zulu8.44.0.13-ca-fx-jdk8.0.242-linux_x64.tar.gz - - name: Build with Gradle - run: ./gradlew shadowJar + run: bash makeJar.sh diff --git a/build.gradle b/build.gradle index 0af6587bb..aa28986ff 100644 --- a/build.gradle +++ b/build.gradle @@ -352,8 +352,8 @@ dependencies { //compile fileTree (dir: 'libraries/java-bowler/libs/', includes: ['*.jar']) implementation 'com.google.guava:guava:19+' - api 'org.kohsuke.stapler:stapler:1.263' - api group: 'org.kohsuke', name: 'wordnet-random-name', version: '1.2' + implementation 'org.kohsuke.stapler:stapler:1.263' + implementation group: 'org.kohsuke', name: 'wordnet-random-name', version: '1.2' //https://github.com/HanSolo/Medusa diff --git a/makeJar.sh b/makeJar.sh new file mode 100644 index 000000000..2cdf253b5 --- /dev/null +++ b/makeJar.sh @@ -0,0 +1,19 @@ +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +export ARCH=x86_64 +JVM=zulu8.78.0.19-ca-fx-jdk8.0.412-linux_x64 +set -e +ZIP=$JVM.tar.gz +export JAVA_HOME=$HOME/bin/java8/ +if test -d $JAVA_HOME/$JVM/; then + echo "$JAVA_HOME exists." +else + rm -rf $JAVA_HOME + mkdir -p $JAVA_HOME + wget https://cdn.azul.com/zulu/bin/$ZIP + tar -xvzf $ZIP -C $JAVA_HOME + mv $JAVA_HOME/$JVM/* $JAVA_HOME/ +fi +echo "Java home set to $JAVA_HOME" + +./gradlew clean shadowJar \ No newline at end of file