From c8ca3ad820f9b6d0185e4ba079ee1c8f473600b0 Mon Sep 17 00:00:00 2001 From: SuperPotato27 Date: Wed, 17 Jul 2024 11:00:50 -0400 Subject: [PATCH] adding eventlog Jar to the package --- .github/workflows/hirs_package_linux.yml | 2 ++ tools/tcg_eventlog_tool/build.gradle | 31 ++++++++++++------------ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/hirs_package_linux.yml b/.github/workflows/hirs_package_linux.yml index 4125312d..fbf15e86 100644 --- a/.github/workflows/hirs_package_linux.yml +++ b/.github/workflows/hirs_package_linux.yml @@ -45,7 +45,9 @@ jobs: cp HIRS_Utils/build/libs/*.jar artifacts/jars/. cp HIRS_Structs/build/libs/*.jar artifacts/jars/. cp tools/tcg_rim_tool/build/distributions/*.zip artifacts/win + cp tools/tcg_eventlog_tool/build/distributions/*.zip artifacts/win cp package/win/tcg-rim-tool/*.ps1 artifacts/win + - name: Archive RPM files uses: actions/upload-artifact@v4 with: diff --git a/tools/tcg_eventlog_tool/build.gradle b/tools/tcg_eventlog_tool/build.gradle index 8c19820a..1d6186bb 100644 --- a/tools/tcg_eventlog_tool/build.gradle +++ b/tools/tcg_eventlog_tool/build.gradle @@ -126,19 +126,18 @@ ospackage { } -// -//task buildZip(type: Zip){ -// dependsOn jar -// from(tasks.jar.archiveFile){ -// into '/' -// } -// -//// arch = 'win' -// // project_subproject-release version_data-git commit hash-arch.extension -// archiveBaseName.set(project.name + '-' + jarVersion) -// archiveExtension.set('zip') -// destinationDirectory.set(file("$buildDir/distributions")) -//} -// -//buildZip.dependsOn jar -////build.dependsOn buildZip \ No newline at end of file + +task buildZip(type: Zip){ + dependsOn jar + from(tasks.jar.archiveFile){ + into '/' + } + + + archiveBaseName.set(project.name) + archiveExtension.set('zip') + destinationDirectory.set(file("$buildDir/distributions")) +} + +buildZip.dependsOn jar +//build.dependsOn buildZip \ No newline at end of file