diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d456750..3a0c77a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,7 +74,7 @@ jobs: matrix: include: - {image: "archlinux:latest", arch: amd64} - - {image: "lopsided/archlinux-arm32v7:latest", arch: arm32, labels: [arm32,docker]} + # - {image: "lopsided/archlinux-arm32v7:latest", arch: arm32, labels: [arm32,docker]} - {image: "lopsided/archlinux-arm64v8:latest", arch: arm64, labels: [arm64,docker]} runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }} container: ${{ matrix.image }} diff --git a/nuget/build_nuget.ps1 b/nuget/build_nuget.ps1 index a779be3..61944f5 100644 --- a/nuget/build_nuget.ps1 +++ b/nuget/build_nuget.ps1 @@ -29,14 +29,14 @@ Get-ChildItem "." -Filter *.in | Foreach-Object{ # msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v140_Release /p:Platform=x64 /v:minimal /nologo # If(!$?){exit 1} -msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v141_Debug /p:Platform=x86 /v:minimal /nologo -If(!$?){exit 1} -msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v141_Release /p:Platform=x86 /v:minimal /nologo -If(!$?){exit 1} -msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v141_Debug /p:Platform=x64 /v:minimal /nologo -If(!$?){exit 1} -msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v141_Release /p:Platform=x64 /v:minimal /nologo -If(!$?){exit 1} +# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v141_Debug /p:Platform=x86 /v:minimal /nologo +# If(!$?){exit 1} +# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v141_Release /p:Platform=x86 /v:minimal /nologo +# If(!$?){exit 1} +# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v141_Debug /p:Platform=x64 /v:minimal /nologo +# If(!$?){exit 1} +# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v141_Release /p:Platform=x64 /v:minimal /nologo +# If(!$?){exit 1} msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} diff --git a/nuget/nuget.autopkg.in b/nuget/nuget.autopkg.in index b7e5b62..9c5852c 100644 --- a/nuget/nuget.autopkg.in +++ b/nuget/nuget.autopkg.in @@ -57,7 +57,7 @@ nuget{ } */ //==== v141 tools ==== - +/* [x86,v141,release] { lib: ..\msvs_solution\v141_Release\libagg.lib; } @@ -70,7 +70,7 @@ nuget{ [x64,v141,debug] { lib: ..\msvs_solution\x64\v141_Debug\libagg.lib; } - +*/ //==== v142 tools ==== [x86,v142,release,MultiThreaded] {