Reduce time spent optimising shadow jar

NeRdTheNed · Jun 6, 2023 · 7e505bf · 7e505bf
1 parent f437be6
commit 7e505bf
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/.github/workflows/draftrelease.yml b/.github/workflows/draftrelease.yml
@@ -38,6 +38,8 @@ jobs:
       run: bash removeDirectoryEntries.sh
     - name: Run strip-nondeterminism on built .jar files
       run: strip-nondeterminism build/libs/*.jar
+    - name: Move shadow jar to temp folder
+      run: mkdir -p tempbuild && mv build/libs/*-with-mixins.jar tempbuild/
     - name: Run advzip (-i 99999) on built .jar files
       run: advzip --shrink-insane -kzi 99999 -p build/libs/*.jar
     - name: Run ECT on built .jar files
@@ -54,6 +56,20 @@ jobs:
       run: for file in ./build/libs/*.jar; do ./ci-tools/ect-ubuntu-x86-64 -90032 --disable-png --disable-jpg -strip -zip $file; done
     - name: Run ECT (-9999) on built .jar files
       run: for file in ./build/libs/*.jar; do ./ci-tools/ect-ubuntu-x86-64 -9999 --disable-png --disable-jpg -strip -zip $file; done
+    - name: Run advzip on shadow jar file
+      run: advzip --shrink-extra -kzp tempbuild/*.jar
+    - name: Run ECT on shadow jar file
+      run: for file in ./tempbuild/*.jar; do ./ci-tools/ect-ubuntu-x86-64 --disable-png --disable-jpg -strip -zip $file; done
+    - name: Run ECT (-9) on shadow jar file
+      run: for file in ./tempbuild/*.jar; do ./ci-tools/ect-ubuntu-x86-64 -9 --disable-png --disable-jpg -strip -zip $file; done
+    - name: Run ECT (-99) on shadow jar file
+      run: for file in ./tempbuild/*.jar; do ./ci-tools/ect-ubuntu-x86-64 -99 --disable-png --disable-jpg -strip -zip $file; done
+    - name: Run ECT (-30060) on shadow jar file
+      run: for file in ./tempbuild/*.jar; do ./ci-tools/ect-ubuntu-x86-64 -30060 --disable-png --disable-jpg -strip -zip $file; done
+    - name: Run ECT (-90032) on shadow jar file
+      run: for file in ./tempbuild/*.jar; do ./ci-tools/ect-ubuntu-x86-64 -90032 --disable-png --disable-jpg -strip -zip $file; done
+    - name: Move shadow jar to main folder
+      run: mv tempbuild/*.jar build/libs/
     - name: Draft release
       uses: softprops/action-gh-release@v1
       with:

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -37,6 +37,8 @@ jobs:
       run: bash removeDirectoryEntries.sh
     - name: Run strip-nondeterminism on built .jar files
       run: strip-nondeterminism build/libs/*.jar
+    - name: Move shadow jar to temp folder
+      run: mkdir -p tempbuild && mv build/libs/*-with-mixins.jar tempbuild/
     - name: Run advzip (-i 999) on built .jar files
       run: advzip --shrink-insane -kzi 999 -p build/libs/*.jar
     - name: Run ECT on built .jar files
@@ -49,6 +51,14 @@ jobs:
       run: for file in ./build/libs/*.jar; do ./ci-tools/ect-ubuntu-x86-64 -30060 --disable-png --disable-jpg -strip -zip $file; done
     - name: Run ECT (-90032) on built .jar files
       run: for file in ./build/libs/*.jar; do ./ci-tools/ect-ubuntu-x86-64 -90032 --disable-png --disable-jpg -strip -zip $file; done
+    - name: Run advzip on shadow jar file
+      run: advzip --shrink-extra -kzp tempbuild/*.jar
+    - name: Run ECT on shadow jar file
+      run: for file in ./tempbuild/*.jar; do ./ci-tools/ect-ubuntu-x86-64 --disable-png --disable-jpg -strip -zip $file; done
+    - name: Run ECT (-9) on shadow jar file
+      run: for file in ./tempbuild/*.jar; do ./ci-tools/ect-ubuntu-x86-64 -9 --disable-png --disable-jpg -strip -zip $file; done
+    - name: Move shadow jar to main folder
+      run: mv tempbuild/*.jar build/libs/
     - uses: actions/upload-artifact@v3
       with:
         name: Package