Merge pull request #337 from autonomys/fix-windows-packaging

Fix Windows packaging and test CI

.github/workflows/release.yml

@@ -76,12 +76,22 @@ jobs:
           Add-Content $env:GITHUB_ENV ("LIB=" + $env:LIB + ";" + "C:\gtk-build\gtk\x64\release\lib")
           Add-Content $env:GITHUB_PATH "C:\gtk-build\gtk\x64\release\bin"
           
+          # We have hardcoded list of libraries in space-acres.wxs, make sure it didn't change unexpectedly
+          Get-ChildItem C:\gtk-build\gtk\x64\release\lib\gdk-pixbuf-2.0\2.10.0\loaders\*.dll | ForEach-Object { $_.Name } > actual-pixbuf-loaders.log
+          if (Compare-Object -ReferenceObject (Get-Content -Path res\windows\wix\expected-pixbuf-loaders.log) -DifferenceObject (Get-Content -Path actual-pixbuf-loaders.log)) {
+            Write-Output "Expected pixbuf -loaders:"
+            Get-Content res\windows\wix\expected-pixbuf-loaders.log
+            Write-Output "`r`nActual pixbuf loaders:"
+            Get-Content actual-pixbuf-loaders.log
+            Throw "Actual pixbuf loaders do not match expected"
+          }
+          
           # We have hardcoded list of libraries in space-acres.wxs, make sure it didn't change unexpectedly
           Get-ChildItem C:\gtk-build\gtk\x64\release\bin\*.dll | ForEach-Object { $_.Name } > actual-dlls.log
           if (Compare-Object -ReferenceObject (Get-Content -Path res\windows\wix\expected-dlls.log) -DifferenceObject (Get-Content -Path actual-dlls.log)) {
             Write-Output "Expected DLLs:"
             Get-Content res\windows\wix\expected-dlls.log
-            Write-Output "Actual DLLs:"
+            Write-Output "`r`nActual DLLs:"
             Get-Content actual-dlls.log
             Throw "Actual DLLs do not match expected"
           }

.github/workflows/rust.yml

@@ -215,12 +215,22 @@ jobs:
           Add-Content $env:GITHUB_ENV ("LIB=" + $env:LIB + ";" + "C:\gtk-build\gtk\x64\release\lib")
           Add-Content $env:GITHUB_PATH "C:\gtk-build\gtk\x64\release\bin"
           
+          # We have hardcoded list of libraries in space-acres.wxs, make sure it didn't change unexpectedly
+          Get-ChildItem C:\gtk-build\gtk\x64\release\lib\gdk-pixbuf-2.0\2.10.0\loaders\*.dll | ForEach-Object { $_.Name } > actual-pixbuf-loaders.log
+          if (Compare-Object -ReferenceObject (Get-Content -Path res\windows\wix\expected-pixbuf-loaders.log) -DifferenceObject (Get-Content -Path actual-pixbuf-loaders.log)) {
+            Write-Output "Expected pixbuf -loaders:"
+            Get-Content res\windows\wix\expected-pixbuf-loaders.log
+            Write-Output "`r`nActual pixbuf loaders:"
+            Get-Content actual-pixbuf-loaders.log
+            Throw "Actual pixbuf loaders do not match expected"
+          }
+          
           # We have hardcoded list of libraries in space-acres.wxs, make sure it didn't change unexpectedly
           Get-ChildItem C:\gtk-build\gtk\x64\release\bin\*.dll | ForEach-Object { $_.Name } > actual-dlls.log
           if (Compare-Object -ReferenceObject (Get-Content -Path res\windows\wix\expected-dlls.log) -DifferenceObject (Get-Content -Path actual-dlls.log)) {
             Write-Output "Expected DLLs:"
             Get-Content res\windows\wix\expected-dlls.log
-            Write-Output "Actual DLLs:"
+            Write-Output "`r`nActual DLLs:"
             Get-Content actual-dlls.log
             Throw "Actual DLLs do not match expected"
           }
@@ -269,5 +279,5 @@ jobs:
         with:
           tool: cargo-nextest
 
-      - name: cargo nextest run --locked --no-tests pass
-        run: cargo -Zgitoxide -Zgit nextest run --locked --no-tests pass
+      - name: cargo nextest run --locked --no-tests=pass
+        run: cargo -Zgitoxide -Zgit nextest run --locked --no-tests=pass

Cargo.toml

@@ -2,7 +2,7 @@
 name = "space-acres"
 description = "Space Acres is an opinionated GUI application for farming on Autonomys Network"
 license = "0BSD"
-version = "0.2.5"
+version = "0.2.6"
 authors = ["Nazar Mokrynskyi <[email protected]>"]
 repository = "https://github.com/autonomys/space-acres"
 edition = "2021"

res/windows/wix/expected-pixbuf-loaders.log

@@ -0,0 +1 @@
+pixbufloader_svg.dll

res/windows/wix/space-acres.wxs

@@ -261,8 +261,8 @@
                         <Directory Id='gdk_pixbuf_2.0' Name='gdk-pixbuf-2.0'>
                             <Directory Id='gdk_pixbuf_2.10.0' Name='2.10.0'>
                                 <Directory Id='loaders' Name='loaders'>
-                                    <Component Id='gdk_pixbuf_loaders' Guid='613bbf0a-780c-4d31-aaab-a81d556c289c'>
-                                        <File Id='libpixbufloader_svg.dll' Name='libpixbufloader-svg.dll' DiskId='1' Source='$(var.CargoTargetDir)\wix\gtk4\lib\gdk-pixbuf-2.0\2.10.0\loaders\libpixbufloader-svg.dll' />
+                                    <Component Id='gdk_pixbuf_loaders' Guid='9784a105-19c9-407c-ab12-28ff80683c51'>
+                                        <File Id='libpixbufloader_svg.dll' Name='libpixbufloader_svg.dll' DiskId='1' Source='$(var.CargoTargetDir)\wix\gtk4\lib\gdk-pixbuf-2.0\2.10.0\loaders\libpixbufloader_svg.dll' />
                                     </Component>
                                 </Directory>