adjust paths

.github/workflows/hirs_package_linux.yml

@@ -47,31 +47,31 @@ jobs:
           cp tools/tcg_rim_tool/build/distributions/*.zip artifacts/win
           cp package/win/tcg-rim-tool/*.ps1 artifacts/win
     - name: Archive RPM files
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: RPM_Files
         path: HIRS_AttestationCAPortal/build/distributions/*.rpm
         if-no-files-found: error
     - name: Archive DEB files
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: DEB_Files
         path: HIRS_AttestationCAPortal/build/distributions/*.deb
         if-no-files-found: error
     - name: War files
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: WAR_Files
         path: HIRS_AttestationCAPortal/build/libs/HIRS_AttestationCAPortal.war
         if-no-files-found: error
     - name: JAR_Files
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: JAR_Files
         path: artifacts/jars/
         if-no-files-found: error
     - name: ZIP_Files
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ZIP_Files
         path: artifacts/win/

tools/tcg_eventlog_tool/build.gradle

@@ -123,4 +123,22 @@ ospackage {
     buildDeb {
         arch = X86_64
     }
+
 }
+
+//
+//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

tools/tcg_rim_tool/build.gradle

@@ -137,28 +137,12 @@ task buildZip(type: Zip){
     from(tasks.jar.archiveFile){
         into '/'
     }
-    from('README.md') {
-        into '/'
-    }
     from('./build/resources/test/rim_fields.json'){
         into '/'
     }
-    from('../../package/win/tcg-rim-tool/rim.ps1'){
-        into '/'
-    }
-    from('../../package/win/tcg-rim-tool/hirsshell.ps1'){
-        into '/'
-    }
-    from('../../package/win/tcg-rim-tool/eventLog.ps1'){
-        into '/'
-    }
-    from('../../package/win/tcg-rim-tool/create_hirstools_desktop_shortcut.ps1'){
-        into '/'
-    }
 
-//    arch = 'win'
-    // project_subproject-release version_data-git commit hash-arch.extension
-    archiveBaseName.set(project.name + '-' + jarVersion)
+
+    archiveBaseName.set(project.name)
     archiveExtension.set('zip')
     destinationDirectory.set(file("$buildDir/distributions"))
 }