diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f8aa8de..e7bf56a 100644 --- a/.github/workflows/release.yml +++ b/.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" } diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3e726be..9e21eda 100644 --- a/.github/workflows/rust.yml +++ b/.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 diff --git a/Cargo.lock b/Cargo.lock index 9870dec..e997200 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12130,7 +12130,7 @@ dependencies = [ [[package]] name = "space-acres" -version = "0.2.5" +version = "0.2.6" dependencies = [ "anyhow", "arc-swap", diff --git a/Cargo.toml b/Cargo.toml index 34912b5..fca45db 100644 --- a/Cargo.toml +++ b/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 "] repository = "https://github.com/autonomys/space-acres" edition = "2021" diff --git a/res/windows/wix/expected-pixbuf-loaders.log b/res/windows/wix/expected-pixbuf-loaders.log new file mode 100644 index 0000000..2661408 --- /dev/null +++ b/res/windows/wix/expected-pixbuf-loaders.log @@ -0,0 +1 @@ +pixbufloader_svg.dll diff --git a/res/windows/wix/space-acres.wxs b/res/windows/wix/space-acres.wxs index 6596c17..0549526 100644 --- a/res/windows/wix/space-acres.wxs +++ b/res/windows/wix/space-acres.wxs @@ -261,8 +261,8 @@ - - + +