From 12fe8dee2a12f4b358a32cc1199042383d762c10 Mon Sep 17 00:00:00 2001
From: Michael Chernov <4ernovm@gmail.com>
Date: Fri, 23 Feb 2024 13:19:22 +0200
Subject: [PATCH] Cleanup soot-wrapper-test

---
 .github/workflows/soot.yml | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/soot.yml b/.github/workflows/soot.yml
index e56d4110..989aabef 100644
--- a/.github/workflows/soot.yml
+++ b/.github/workflows/soot.yml
@@ -33,17 +33,10 @@ jobs:
       - name: Pull JAR from previous release if already built
 #        if: steps.calc-checksum.outputs.hash == steps.calc-checksum.outputs.prev_hash
         run: |
-          curl -LJO https://github.com/${{ github.repository }}/releases/download/${{ steps.calc-checksum.outputs.release_tag }}/soot-wrapper-${{ matrix.java-version }}.jar
+          curl -LJO https://github.com/${{ github.repository }}/releases/download/${{ steps.calc-checksum.outputs.release_tag }}/soot-wrapper-${{ matrix.java-version }}.zip
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Upload JAR from previous release
-        if: steps.calc-checksum.outputs.hash == steps.calc-checksum.outputs.prev_hash
-        uses: actions/upload-artifact@v4
-        with:
-          name: soot-wrapper-${{ matrix.java-version }}.jar
-          path: soot-wrapper-${{ matrix.java-version }}.jar
-
       - name: Set up JDK ${{ matrix.java-version }}
         if: steps.calc-checksum.outputs.hash != steps.calc-checksum.outputs.prev_hash
         uses: actions/setup-java@v4
@@ -63,13 +56,6 @@ jobs:
           zip -r soot-wrapper-${{ matrix.java-version }}.zip java/common/target/*.jar
           ls -la
 
-      - name: Upload generated JAR
-        if: steps.calc-checksum.outputs.hash != steps.calc-checksum.outputs.prev_hash
-        uses: actions/upload-artifact@v4
-        with:
-          name: soot-wrapper-${{ matrix.java-version }}
-          path: java/common/target/*.jar
-
       - name: Store soot-wrapper revision hash
         if: steps.calc-checksum.outputs.hash != steps.calc-checksum.outputs.prev_hash
         run: |
@@ -83,6 +69,12 @@ jobs:
           path: soot-wrapper-rev-hash.txt
           overwrite: 'true'
 
+      - name: Upload the archive
+        uses: actions/upload-artifact@v4
+        with:
+          name: soot-wrapper-${{ matrix.java-version }}.zip
+          path: soot-wrapper-${{ matrix.java-version }}.zip
+
   goreleaser-test:
     runs-on: ubuntu-latest
     needs: soot-wrapper-test
@@ -98,7 +90,7 @@ jobs:
 
       - name: Ensure files are in place
         run: |
-          ls -la soot-wrapper-11
-          ls -la soot-wrapper-17
-          ls -la soot-wrapper-21
+          ls -la soot-wrapper-11.zip
+          ls -la soot-wrapper-17.zip
+          ls -la soot-wrapper-21.zip
           cat soot-wrapper-rev-hash.txt/soot-wrapper-rev-hash.txt