From 094a0fde50e404535e28cae856772f9f346932ec Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Sun, 9 Mar 2025 20:24:33 -0300 Subject: ci: remove Appveyor --- README.md | 1 - appveyor.yml | 101 ------------------------------------------------- makedist | 18 +-------- spec/README.md | 1 - spec/util/test_env.lua | 13 +------ 5 files changed, 4 insertions(+), 130 deletions(-) delete mode 100644 appveyor.yml diff --git a/README.md b/README.md index 4a748224..0076a3ca 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ A package manager for Lua modules. [![Build Status](https://github.com/luarocks/luarocks/actions/workflows/test.yml/badge.svg)](https://github.com/luarocks/luarocks/actions) [![Luacheck](https://github.com/luarocks/luarocks/actions/workflows/luacheck.yml/badge.svg)](https://github.com/luarocks/luarocks/actions/workflows/luacheck.yml) -[![Build Status](https://ci.appveyor.com/api/projects/status/4x4630tcf64da48i/branch/master?svg=true)](https://ci.appveyor.com/project/hishamhm/luarocks/branch/master) [![Coverage Status](https://codecov.io/gh/luarocks/luarocks/coverage.svg?branch=master)](https://codecov.io/gh/luarocks/luarocks/branch/master) [![Join the chat at https://gitter.im/luarocks/luarocks](https://badges.gitter.im/luarocks/luarocks.svg)](https://gitter.im/luarocks/luarocks) diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index da8ab442..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,101 +0,0 @@ -version: 3.0.0.{build}-test - -shallow_clone: true -skip_branch_with_pr: true - -matrix: - fast_finish: true - -environment: - LUAROCKS_VER: 3.0.0 - - matrix: - # quick tests - - LUAV: "2.1" - LUAT: "luajit" - COMPILER: "vs" - FILES: "" - EXCLUDE: "integration,unit" - # Lua 5.4 tests - - LUAV: "5.4" - LUAT: "lua" - COMPILER: "vs" - FILES: "" - EXCLUDE: "integration,quick" - TESTTYPE: "unit" - - LUAV: "5.4" - LUAT: "lua" - COMPILER: "vs" - FILES: "" - EXCLUDE: "unit,quick" - - LUAV: "5.4" - LUAT: "lua" - COMPILER: "mingw" - FILES: "spec//build_spec.lua" - EXCLUDE: "" - # LuaJIT 2.1 tests - - LUAV: "2.1" - LUAT: "luajit" - COMPILER: "vs" - FILES: "" - EXCLUDE: "integration,quick" - TESTTYPE: "unit" - - LUAV: "2.1" - LUAT: "luajit" - COMPILER: "vs" - FILES: "" - EXCLUDE: "unit,quick" - - LUAV: "2.1" - LUAT: "luajit" - COMPILER: "mingw" - FILES: "spec//build_spec.lua" - EXCLUDE: "" - -init: -# Setup Lua development/build environment -# Make VS 2015 command line tools available -- call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %platform% -# Add MinGW compiler to the path -- set PATH=C:\MinGW\bin;%PATH% - -before_build: - - set PATH=C:\Python37;C:\Python37\Scripts;%PATH% # Add directory containing 'pip' to PATH - - IF NOT EXIST lua_install-%LUAV%\bin\activate.bat ( pip install --upgrade certifi ) - - FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "import certifi;print(certifi.where())"`) DO ( SET SSL_CERT_FILE=%%F ) - - IF NOT EXIST lua_install-%LUAV%\bin\activate.bat ( pip install hererocks ) - - IF NOT EXIST lua_install-%LUAV%\bin\activate.bat ( hererocks lua_install-%LUAV% --%LUAT% %LUAV% --luarocks latest --target=%COMPILER% ) - - call lua_install-%LUAV%\bin\activate - - nuget install bzip2 -OutputDirectory deps\bzip2 - - nuget install zlib -OutputDirectory deps\zlib - - mkdir c:\external\include - - mkdir c:\external\lib - - copy deps\bzip2\bzip2.1.0.6.11\build\native\include\bzlib.h c:\external\include - - copy deps\bzip2\bzip2.1.0.6.11\build\native\lib\v110\win32\Debug\dynamic\cdecl\libbz2.lib c:\external\lib\bz2.lib - - copy deps\bzip2\bzip2.redist.1.0.6.11\build\native\bin\v110\win32\Debug\dynamic\cdecl\libbz2.dll c:\external\lib\bz2.dll - - copy deps\zlib\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\include\*.h c:\external\include - - copy deps\zlib\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\lib\native\v120\windesktop\msvcstl\dyn\rt-dyn\Win32\MinSizeRel\zlib.dll c:\external\lib\z.dll - - copy deps\zlib\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\lib\native\v120\windesktop\msvcstl\dyn\rt-dyn\Win32\MinSizeRel\zlib.lib c:\external\lib\z.lib - -build_script: - - luarocks install compat53 1> NUL 2> NUL - - IF NOT EXIST lua_install-%LUAV%\bin\busted.bat ( luarocks install busted 1> NUL 2> NUL ) - - IF NOT EXIST lua_install-%LUAV%\bin\luacov.bat ( luarocks install cluacov 1> NUL 2> NUL ) - - luarocks install busted-htest 1> NUL 2> NUL - -test_script: - - busted -o htest -v --lpath=.//?.lua --exclude-tags=ssh,unix,%EXCLUDE% -Xhelper lua_dir=%CD%\lua_install-%LUAV%,appveyor,%COMPILER% %FILES% - - IF "%TESTTYPE%"=="unit" ( busted -o htest -v --lpath=.//?.lua --exclude-tags=ssh,unix,%EXCLUDE% -Xhelper lua_dir=%CD%\lua_install-%LUAV%,appveyor,%COMPILER%,env=full %FILES% ) - -after_test: - - pip install codecov - - luacov -c testrun/luacov.config - - cd testrun && codecov -f luacov.report.out -X gcov - -cache: - - lua_install-5.4 - - lua_install-2.1 - - testrun/testing_cache-5.4 - - testrun/testing_cache-2.1 - - testrun/testing_server-5.4 - - testrun/testing_server-2.1 - - testrun/binary-samples diff --git a/makedist b/makedist index ac7a466e..8b65a62e 100755 --- a/makedist +++ b/makedist @@ -61,8 +61,6 @@ then sed -i 's/version = "[^"]*"/version = "'$version'-1"/' $ROCKSPEC sed -i 's/\( url = "[^"]*",\)/\1\n tag = "v'$version'"/' $ROCKSPEC sed -i 's/program_version = "[^"]*"/program_version = "'$version'"/' src/luarocks/core/cfg.lua - sed -i 's/version: [0-9.]*/version: '$version'./' appveyor.yml - sed -i 's/LUAROCKS_VER: [0-9.]*/LUAROCKS_VER: '$version'/' appveyor.yml sed -i 's/vars.VERSION = "[0-9.]*"/vars.VERSION = "'$xyversion'"/' install.bat echo "===============================================================================" git diff @@ -100,18 +98,6 @@ grep -q "program_version = \"$version\"" src/luarocks/core/cfg.lua || { exit 1 } -grep -q "version: $version\\." appveyor.yml || { - echo - echo "version in appveyor.yml is incorrect. Please fix it." - exit 1 -} - -grep -q "LUAROCKS_VER: $version" appveyor.yml || { - echo - echo "LUAROCKS_VER in appveyor.yml is incorrect. Please fix it." - exit 1 -} - grep -q "vars.VERSION = \"$xyversion\"" install.bat || { echo echo "vars.VERSION in install.bat is incorrect. Please fix it." @@ -143,7 +129,7 @@ mkdir "release-windows" mv "$out" "release-windows/$out-win32" cd "release-unix/$out" -rm -rf makedist install.bat win32 .github .gitignore appveyor* .appveyor +rm -rf makedist install.bat win32 .github .gitignore cd .. tar czvpf ../"$out.tar.gz" "$out" rm -f ../"$out.tar.gz.asc" @@ -151,7 +137,7 @@ cd .. rm -rf "release-unix" cd "release-windows/$out-win32" -rm -rf makedist Makefile GNUmakefile configure .github .gitignore test appveyor* .appveyor +rm -rf makedist Makefile GNUmakefile configure .github .gitignore test cd .. zip -r ../"$out-win32.zip" "$out-win32" rm -f ../"$out-win32.zip.asc" diff --git a/spec/README.md b/spec/README.md index f2777eaa..0249ad04 100644 --- a/spec/README.md +++ b/spec/README.md @@ -26,7 +26,6 @@ LuaRocks folder or specify with *-C* flag. env=, (default:"minimal") type what kind of environment to use ["minimal", "full"] noreset, Don't reset environment after each test clean, remove existing testing environment -appveyor, add just if running on Appveyor ci, add just if running on Unix CI ci-windows, add just if running on Windows CI os=, type your OS ["linux", "os x", "windows"] diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua index 69874d79..da293b45 100644 --- a/spec/util/test_env.lua +++ b/spec/util/test_env.lua @@ -20,7 +20,6 @@ ARGUMENTS clean Remove existing testing environment. ci Add if running on Unix CI. ci-windows Add if running on Windows CI. - appveyor Add if running on Appveyor. os= Set OS ("linux", "osx", or "windows"). lua_dir= Path of Lua installation (default "/usr/local") lua= Name of the interpreter, may be full path (default "lua") @@ -354,8 +353,6 @@ function test_env.set_args() test_env.CI = true elseif argument == "ci-windows" then test_env.CI_WINDOWS = true - elseif argument == "appveyor" then - test_env.APPVEYOR = true elseif argument:find("^os=") then test_env.TEST_TARGET_OS = argument:match("^os=(.*)$") elseif argument == "mingw" then @@ -376,12 +373,6 @@ function test_env.set_args() if dir_sep == "\\" then test_env.TEST_TARGET_OS = "windows" - if test_env.APPVEYOR then - test_env.OPENSSL_INCDIR = "C:\\OpenSSL-v111-Win32\\include" - test_env.OPENSSL_LIBDIR = "C:\\OpenSSL-v111-Win32\\lib" - if test_env.MINGW then - test_env.OPENSSL_LIBDIR = "C:\\OpenSSL-v111-Win32\\bin" - end elseif test_env.CI_WINDOWS then if test_env.MINGW then test_env.OPENSSL_INCDIR = "c:\\msys64\\ucrt64\\include" @@ -686,8 +677,8 @@ local function build_environment(rocks, env_variables) lfs.mkdir(testing_paths.testing_deps_tree) test_env.run.luarocks_admin_nocov(C("make_manifest", Q(testing_paths.testing_server))) - test_env.run.luarocks_admin_nocov(C("make_manifest", Q(testing_paths.testing_cache))) - + test_env.run.luarocks_admin_nocov(C("make_manifest", Q(testing_paths.testing_cache))) + if test_env.MSVCRT then test_env.run.luarocks_nocov(C("config", "variables.MSVCRT", Q(test_env.MSVCRT), Q("--tree=" .. testing_paths.testing_cache))) end -- cgit v1.2.3-55-g6feb