fix(CI): appveyor FTBFS due to mingw location change
This commit is contained in:
		
							
								
								
									
										6
									
								
								.github/workflows/windows.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								.github/workflows/windows.yml
									
									
									
									
										vendored
									
									
								
							@ -90,9 +90,9 @@ jobs:
 | 
				
			|||||||
        cmake --build build_dependencies/aom --config Release --target=install || goto :error
 | 
					        cmake --build build_dependencies/aom --config Release --target=install || goto :error
 | 
				
			||||||
        echo ::endgroup::
 | 
					        echo ::endgroup::
 | 
				
			||||||
        echo ::group::===== libavif =====
 | 
					        echo ::group::===== libavif =====
 | 
				
			||||||
        curl -fsSL -o libavif-v1_2_1.zip https://github.com/AOMediaCodec/libavif/archive/v1.2.1.zip
 | 
					        curl -fsSL -o libavif-v1_3_0.zip https://github.com/AOMediaCodec/libavif/archive/v1.3.0.zip
 | 
				
			||||||
        7z x libavif-v1_2_1.zip -y -o"dependencies_src"
 | 
					        7z x libavif-v1_3_0.zip -y -o"dependencies_src"
 | 
				
			||||||
        ren .\dependencies_src\libavif-1.2.1 libavif || goto :error
 | 
					        ren .\dependencies_src\libavif-1.3.0 libavif || goto :error
 | 
				
			||||||
        cmake ./dependencies_src/libavif -Bbuild_dependencies/libavif -DCMAKE_INSTALL_PREFIX="dependencies_bin" -DAVIF_CODEC_AOM=ON -DAVIF_LIBYUV=LOCAL
 | 
					        cmake ./dependencies_src/libavif -Bbuild_dependencies/libavif -DCMAKE_INSTALL_PREFIX="dependencies_bin" -DAVIF_CODEC_AOM=ON -DAVIF_LIBYUV=LOCAL
 | 
				
			||||||
        cmake --build build_dependencies/libavif --config Release --target=install || goto :error
 | 
					        cmake --build build_dependencies/libavif --config Release --target=install || goto :error
 | 
				
			||||||
        echo ::endgroup::
 | 
					        echo ::endgroup::
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										12
									
								
								appveyor.yml
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								appveyor.yml
									
									
									
									
									
								
							@ -10,7 +10,7 @@ environment:
 | 
				
			|||||||
  matrix:
 | 
					  matrix:
 | 
				
			||||||
    - job_name: mingw_64_qt6_8
 | 
					    - job_name: mingw_64_qt6_8
 | 
				
			||||||
      QTDIR: C:\Qt\6.8\mingw_64
 | 
					      QTDIR: C:\Qt\6.8\mingw_64
 | 
				
			||||||
      MINGW64: C:\Qt\Tools\mingw1310_64
 | 
					      MINGW64: C:\Qt\mingw_64\Tools\mingw1310_64
 | 
				
			||||||
      KF_BRANCH: master
 | 
					      KF_BRANCH: master
 | 
				
			||||||
      EXIV2_VERSION: "0.28.5"
 | 
					      EXIV2_VERSION: "0.28.5"
 | 
				
			||||||
      EXIV2_CMAKE_OPTIONS: "-DEXIV2_ENABLE_BROTLI=OFF -DEXIV2_ENABLE_INIH=OFF -DEXIV2_BUILD_EXIV2_COMMAND=OFF"
 | 
					      EXIV2_CMAKE_OPTIONS: "-DEXIV2_ENABLE_BROTLI=OFF -DEXIV2_ENABLE_INIH=OFF -DEXIV2_BUILD_EXIV2_COMMAND=OFF"
 | 
				
			||||||
@ -74,12 +74,12 @@ build_script:
 | 
				
			|||||||
  - cd %APPVEYOR_BUILD_FOLDER%
 | 
					  - cd %APPVEYOR_BUILD_FOLDER%
 | 
				
			||||||
# install libavif for avif format support of KImageFormats
 | 
					# install libavif for avif format support of KImageFormats
 | 
				
			||||||
  - cd %LIBAVIF%
 | 
					  - cd %LIBAVIF%
 | 
				
			||||||
  - curl -fsSL -o libavif-v1_1_1.zip https://github.com/AOMediaCodec/libavif/archive/v1.1.1.zip
 | 
					  - curl -fsSL -o libavif-v1_3_0.zip https://github.com/AOMediaCodec/libavif/archive/v1.3.0.zip
 | 
				
			||||||
  - 7z x libavif-v1_1_1.zip -y
 | 
					  - 7z x libavif-v1_3_0.zip -y
 | 
				
			||||||
  - cd libavif-1.1.1
 | 
					  - cd libavif-1.3.0
 | 
				
			||||||
  - mkdir build
 | 
					  - mkdir build
 | 
				
			||||||
  - cd build
 | 
					  - cd build
 | 
				
			||||||
  - cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% -DAVIF_CODEC_AOM=ON -DAVIF_LOCAL_LIBYUV=ON
 | 
					  - cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% -DAVIF_CODEC_AOM=ON -DAVIF_LIBYUV=LOCAL
 | 
				
			||||||
  - cmake --build . --config Release
 | 
					  - cmake --build . --config Release
 | 
				
			||||||
  - cmake --build . --config Release --target install/strip
 | 
					  - cmake --build . --config Release --target install/strip
 | 
				
			||||||
  - cd %APPVEYOR_BUILD_FOLDER%
 | 
					  - cd %APPVEYOR_BUILD_FOLDER%
 | 
				
			||||||
@ -144,7 +144,7 @@ build_script:
 | 
				
			|||||||
  - copy %APPVEYOR_BUILD_FOLDER%\3rdparty\karchive\LICENSES\LGPL-2.0-or-later.txt License.KArchive.txt
 | 
					  - copy %APPVEYOR_BUILD_FOLDER%\3rdparty\karchive\LICENSES\LGPL-2.0-or-later.txt License.KArchive.txt
 | 
				
			||||||
  - copy %APPVEYOR_BUILD_FOLDER%\3rdparty\kimageformats\LICENSES\LGPL-2.1-or-later.txt License.kimageformats.txt
 | 
					  - copy %APPVEYOR_BUILD_FOLDER%\3rdparty\kimageformats\LICENSES\LGPL-2.1-or-later.txt License.kimageformats.txt
 | 
				
			||||||
  - copy %LIBEXPAT%\libexpat-R_2_6_2\expat\COPYING License.expat.txt
 | 
					  - copy %LIBEXPAT%\libexpat-R_2_6_2\expat\COPYING License.expat.txt
 | 
				
			||||||
  - copy %LIBAVIF%\libavif-1.1.1\LICENSE License.libavif.txt
 | 
					  - copy %LIBAVIF%\libavif-1.3.0\LICENSE License.libavif.txt
 | 
				
			||||||
  - copy %LIBEXIV2%\exiv2-%EXIV2_VERSION%\COPYING License.exiv2.txt
 | 
					  - copy %LIBEXIV2%\exiv2-%EXIV2_VERSION%\COPYING License.exiv2.txt
 | 
				
			||||||
# TODO: Qt, zlib
 | 
					# TODO: Qt, zlib
 | 
				
			||||||
  - cd ..
 | 
					  - cd ..
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user