v0.3

.github/workflows/build.yml

@@ -62,6 +62,7 @@ jobs:
             gui: packobf_gui
             java-lib: librust.so
             qt-arch: linux_gcc_64
+            qt-version: 6.8.3
 
           # Linux x64 MUSL
           - os: ubuntu-latest
@@ -71,6 +72,7 @@ jobs:
             gui: ""
             java-lib: librust.so
             qt-arch: ""
+            qt-version: ""
 
           # Linux ARM64
           - os: ubuntu-22.04 # using an older version of Ubuntu for linuxdeployqt
@@ -80,6 +82,7 @@ jobs:
             gui: ""
             java-lib: librust.so
             qt-arch: ""
+            qt-version: ""
 
           # macOS Intel
           - os: macos-latest
@@ -89,6 +92,7 @@ jobs:
             gui: packobf_gui
             java-lib: librust.dylib
             qt-arch: clang_64
+            qt-version: 6.11.2
 
           # macOS Apple Silicon
           - os: macos-latest
@@ -98,6 +102,7 @@ jobs:
             gui: packobf_gui
             java-lib: librust.dylib
             qt-arch: clang_64
+            qt-version: 6.11.2
 
           # Windows x64
           - os: windows-latest
@@ -107,6 +112,7 @@ jobs:
             gui: packobf_gui.exe
             java-lib: rust.dll
             qt-arch: win64_msvc2022_64
+            qt-version: 6.8.3
 
           # Windows ARM64
           - os: windows-latest
@@ -116,6 +122,7 @@ jobs:
             gui: ""
             java-lib: rust.dll
             qt-arch: ""
+            qt-version: ""
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -129,14 +136,16 @@ jobs:
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
         with:
-          prefix-key: "v1-rust-qt-6.8.3-${{ matrix.os }}-${{ matrix.target }}"
+          prefix-key: "v1-rust-qt-${{ matrix.qt-version }}-${{ matrix.os }}-${{ matrix.target }}"
 
       - name: Install Qt
         if: matrix.gui != ''
         uses: jurplel/install-qt-action@v4
         with:
-          version: '6.8.3'
+          version: ${{ matrix.qt-version }}
           arch: ${{ matrix.qt-arch }}
+          cache: 'true'
+          cache-key-prefix: "v1-qt-qt-${{ matrix.qt-version }}-${{ matrix.os }}-${{ matrix.target }}"
 
       - name: Install cross (linux-x86_64-musl and linux-aarch64)
         if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'x86_64-unknown-linux-musl'
@@ -223,14 +232,14 @@ jobs:
           chmod +x linuxdeployqt-continuous-x86_64.AppImage
 
           # Cleanup Qt installation
-          rm -rf ../Qt/6.8.3/gcc_64/plugins/printsupport
-          rm -rf ../Qt/6.8.3/gcc_64/plugins/sqldrivers
-          rm -rf ../Qt/6.8.3/gcc_64/plugins/help
-          rm -rf ../Qt/6.8.3/gcc_64/plugins/designer
-          rm -rf ../Qt/6.8.3/gcc_64/plugins/qmltooling
-          rm -rf ../Qt/6.8.3/gcc_64/plugins/qmlls
-          rm -rf ../Qt/6.8.3/gcc_64/plugins/qmllint
-          rm -rf ../Qt/6.8.3/gcc_64/plugins/platformthemes/libqgtk3.so
+          rm -rf ../Qt/${{ matrix.qt-version }}/gcc_64/plugins/printsupport
+          rm -rf ../Qt/${{ matrix.qt-version }}/gcc_64/plugins/sqldrivers
+          rm -rf ../Qt/${{ matrix.qt-version }}/gcc_64/plugins/help
+          rm -rf ../Qt/${{ matrix.qt-version }}/gcc_64/plugins/designer
+          rm -rf ../Qt/${{ matrix.qt-version }}/gcc_64/plugins/qmltooling
+          rm -rf ../Qt/${{ matrix.qt-version }}/gcc_64/plugins/qmlls
+          rm -rf ../Qt/${{ matrix.qt-version }}/gcc_64/plugins/qmllint
+          rm -rf ../Qt/${{ matrix.qt-version }}/gcc_64/plugins/platformthemes/libqgtk3.so
 
           cat <<EOF > dist/packobf_gui.desktop
           [Desktop Entry]

.gitignore

@@ -3,3 +3,5 @@ target
 
 # keep your zip files!
 **/*.zip
+
+packobf_gui/.qmlls.ini