aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2025-03-09 20:24:33 -0300
committerHisham Muhammad <hisham@gobolinux.org>2025-03-09 20:24:33 -0300
commit094a0fde50e404535e28cae856772f9f346932ec (patch)
treeb0ea212cd5d77ad66713da7f99c184a6fb836c39
parent0d6705b1069cc38fda36fc831465485b6cda01b0 (diff)
downloadluarocks-094a0fde50e404535e28cae856772f9f346932ec.tar.gz
luarocks-094a0fde50e404535e28cae856772f9f346932ec.tar.bz2
luarocks-094a0fde50e404535e28cae856772f9f346932ec.zip
ci: remove Appveyor
-rw-r--r--README.md1
-rw-r--r--appveyor.yml101
-rwxr-xr-xmakedist18
-rw-r--r--spec/README.md1
-rw-r--r--spec/util/test_env.lua13
5 files changed, 4 insertions, 130 deletions
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.
4 4
5[![Build Status](https://github.com/luarocks/luarocks/actions/workflows/test.yml/badge.svg)](https://github.com/luarocks/luarocks/actions) 5[![Build Status](https://github.com/luarocks/luarocks/actions/workflows/test.yml/badge.svg)](https://github.com/luarocks/luarocks/actions)
6[![Luacheck](https://github.com/luarocks/luarocks/actions/workflows/luacheck.yml/badge.svg)](https://github.com/luarocks/luarocks/actions/workflows/luacheck.yml) 6[![Luacheck](https://github.com/luarocks/luarocks/actions/workflows/luacheck.yml/badge.svg)](https://github.com/luarocks/luarocks/actions/workflows/luacheck.yml)
7[![Build Status](https://ci.appveyor.com/api/projects/status/4x4630tcf64da48i/branch/master?svg=true)](https://ci.appveyor.com/project/hishamhm/luarocks/branch/master)
8[![Coverage Status](https://codecov.io/gh/luarocks/luarocks/coverage.svg?branch=master)](https://codecov.io/gh/luarocks/luarocks/branch/master) 7[![Coverage Status](https://codecov.io/gh/luarocks/luarocks/coverage.svg?branch=master)](https://codecov.io/gh/luarocks/luarocks/branch/master)
9[![Join the chat at https://gitter.im/luarocks/luarocks](https://badges.gitter.im/luarocks/luarocks.svg)](https://gitter.im/luarocks/luarocks) 8[![Join the chat at https://gitter.im/luarocks/luarocks](https://badges.gitter.im/luarocks/luarocks.svg)](https://gitter.im/luarocks/luarocks)
10 9
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index da8ab442..00000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,101 +0,0 @@
1version: 3.0.0.{build}-test
2
3shallow_clone: true
4skip_branch_with_pr: true
5
6matrix:
7 fast_finish: true
8
9environment:
10 LUAROCKS_VER: 3.0.0
11
12 matrix:
13 # quick tests
14 - LUAV: "2.1"
15 LUAT: "luajit"
16 COMPILER: "vs"
17 FILES: ""
18 EXCLUDE: "integration,unit"
19 # Lua 5.4 tests
20 - LUAV: "5.4"
21 LUAT: "lua"
22 COMPILER: "vs"
23 FILES: ""
24 EXCLUDE: "integration,quick"
25 TESTTYPE: "unit"
26 - LUAV: "5.4"
27 LUAT: "lua"
28 COMPILER: "vs"
29 FILES: ""
30 EXCLUDE: "unit,quick"
31 - LUAV: "5.4"
32 LUAT: "lua"
33 COMPILER: "mingw"
34 FILES: "spec//build_spec.lua"
35 EXCLUDE: ""
36 # LuaJIT 2.1 tests
37 - LUAV: "2.1"
38 LUAT: "luajit"
39 COMPILER: "vs"
40 FILES: ""
41 EXCLUDE: "integration,quick"
42 TESTTYPE: "unit"
43 - LUAV: "2.1"
44 LUAT: "luajit"
45 COMPILER: "vs"
46 FILES: ""
47 EXCLUDE: "unit,quick"
48 - LUAV: "2.1"
49 LUAT: "luajit"
50 COMPILER: "mingw"
51 FILES: "spec//build_spec.lua"
52 EXCLUDE: ""
53
54init:
55# Setup Lua development/build environment
56# Make VS 2015 command line tools available
57- call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %platform%
58# Add MinGW compiler to the path
59- set PATH=C:\MinGW\bin;%PATH%
60
61before_build:
62 - set PATH=C:\Python37;C:\Python37\Scripts;%PATH% # Add directory containing 'pip' to PATH
63 - IF NOT EXIST lua_install-%LUAV%\bin\activate.bat ( pip install --upgrade certifi )
64 - FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "import certifi;print(certifi.where())"`) DO ( SET SSL_CERT_FILE=%%F )
65 - IF NOT EXIST lua_install-%LUAV%\bin\activate.bat ( pip install hererocks )
66 - IF NOT EXIST lua_install-%LUAV%\bin\activate.bat ( hererocks lua_install-%LUAV% --%LUAT% %LUAV% --luarocks latest --target=%COMPILER% )
67 - call lua_install-%LUAV%\bin\activate
68 - nuget install bzip2 -OutputDirectory deps\bzip2
69 - nuget install zlib -OutputDirectory deps\zlib
70 - mkdir c:\external\include
71 - mkdir c:\external\lib
72 - copy deps\bzip2\bzip2.1.0.6.11\build\native\include\bzlib.h c:\external\include
73 - copy deps\bzip2\bzip2.1.0.6.11\build\native\lib\v110\win32\Debug\dynamic\cdecl\libbz2.lib c:\external\lib\bz2.lib
74 - copy deps\bzip2\bzip2.redist.1.0.6.11\build\native\bin\v110\win32\Debug\dynamic\cdecl\libbz2.dll c:\external\lib\bz2.dll
75 - copy deps\zlib\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\include\*.h c:\external\include
76 - 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
77 - 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
78
79build_script:
80 - luarocks install compat53 1> NUL 2> NUL
81 - IF NOT EXIST lua_install-%LUAV%\bin\busted.bat ( luarocks install busted 1> NUL 2> NUL )
82 - IF NOT EXIST lua_install-%LUAV%\bin\luacov.bat ( luarocks install cluacov 1> NUL 2> NUL )
83 - luarocks install busted-htest 1> NUL 2> NUL
84
85test_script:
86 - busted -o htest -v --lpath=.//?.lua --exclude-tags=ssh,unix,%EXCLUDE% -Xhelper lua_dir=%CD%\lua_install-%LUAV%,appveyor,%COMPILER% %FILES%
87 - 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% )
88
89after_test:
90 - pip install codecov
91 - luacov -c testrun/luacov.config
92 - cd testrun && codecov -f luacov.report.out -X gcov
93
94cache:
95 - lua_install-5.4
96 - lua_install-2.1
97 - testrun/testing_cache-5.4
98 - testrun/testing_cache-2.1
99 - testrun/testing_server-5.4
100 - testrun/testing_server-2.1
101 - testrun/binary-samples
diff --git a/makedist b/makedist
index ac7a466e..8b65a62e 100755
--- a/makedist
+++ b/makedist
@@ -61,8 +61,6 @@ then
61 sed -i 's/version = "[^"]*"/version = "'$version'-1"/' $ROCKSPEC 61 sed -i 's/version = "[^"]*"/version = "'$version'-1"/' $ROCKSPEC
62 sed -i 's/\( url = "[^"]*",\)/\1\n tag = "v'$version'"/' $ROCKSPEC 62 sed -i 's/\( url = "[^"]*",\)/\1\n tag = "v'$version'"/' $ROCKSPEC
63 sed -i 's/program_version = "[^"]*"/program_version = "'$version'"/' src/luarocks/core/cfg.lua 63 sed -i 's/program_version = "[^"]*"/program_version = "'$version'"/' src/luarocks/core/cfg.lua
64 sed -i 's/version: [0-9.]*/version: '$version'./' appveyor.yml
65 sed -i 's/LUAROCKS_VER: [0-9.]*/LUAROCKS_VER: '$version'/' appveyor.yml
66 sed -i 's/vars.VERSION = "[0-9.]*"/vars.VERSION = "'$xyversion'"/' install.bat 64 sed -i 's/vars.VERSION = "[0-9.]*"/vars.VERSION = "'$xyversion'"/' install.bat
67 echo "===============================================================================" 65 echo "==============================================================================="
68 git diff 66 git diff
@@ -100,18 +98,6 @@ grep -q "program_version = \"$version\"" src/luarocks/core/cfg.lua || {
100 exit 1 98 exit 1
101} 99}
102 100
103grep -q "version: $version\\." appveyor.yml || {
104 echo
105 echo "version in appveyor.yml is incorrect. Please fix it."
106 exit 1
107}
108
109grep -q "LUAROCKS_VER: $version" appveyor.yml || {
110 echo
111 echo "LUAROCKS_VER in appveyor.yml is incorrect. Please fix it."
112 exit 1
113}
114
115grep -q "vars.VERSION = \"$xyversion\"" install.bat || { 101grep -q "vars.VERSION = \"$xyversion\"" install.bat || {
116 echo 102 echo
117 echo "vars.VERSION in install.bat is incorrect. Please fix it." 103 echo "vars.VERSION in install.bat is incorrect. Please fix it."
@@ -143,7 +129,7 @@ mkdir "release-windows"
143mv "$out" "release-windows/$out-win32" 129mv "$out" "release-windows/$out-win32"
144 130
145cd "release-unix/$out" 131cd "release-unix/$out"
146rm -rf makedist install.bat win32 .github .gitignore appveyor* .appveyor 132rm -rf makedist install.bat win32 .github .gitignore
147cd .. 133cd ..
148tar czvpf ../"$out.tar.gz" "$out" 134tar czvpf ../"$out.tar.gz" "$out"
149rm -f ../"$out.tar.gz.asc" 135rm -f ../"$out.tar.gz.asc"
@@ -151,7 +137,7 @@ cd ..
151rm -rf "release-unix" 137rm -rf "release-unix"
152 138
153cd "release-windows/$out-win32" 139cd "release-windows/$out-win32"
154rm -rf makedist Makefile GNUmakefile configure .github .gitignore test appveyor* .appveyor 140rm -rf makedist Makefile GNUmakefile configure .github .gitignore test
155cd .. 141cd ..
156zip -r ../"$out-win32.zip" "$out-win32" 142zip -r ../"$out-win32.zip" "$out-win32"
157rm -f ../"$out-win32.zip.asc" 143rm -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.
26env=<type>, (default:"minimal") type what kind of environment to use ["minimal", "full"] 26env=<type>, (default:"minimal") type what kind of environment to use ["minimal", "full"]
27noreset, Don't reset environment after each test 27noreset, Don't reset environment after each test
28clean, remove existing testing environment 28clean, remove existing testing environment
29appveyor, add just if running on Appveyor
30ci, add just if running on Unix CI 29ci, add just if running on Unix CI
31ci-windows, add just if running on Windows CI 30ci-windows, add just if running on Windows CI
32os=<version>, type your OS ["linux", "os x", "windows"] 31os=<version>, 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
20 clean Remove existing testing environment. 20 clean Remove existing testing environment.
21 ci Add if running on Unix CI. 21 ci Add if running on Unix CI.
22 ci-windows Add if running on Windows CI. 22 ci-windows Add if running on Windows CI.
23 appveyor Add if running on Appveyor.
24 os=<type> Set OS ("linux", "osx", or "windows"). 23 os=<type> Set OS ("linux", "osx", or "windows").
25 lua_dir=<path> Path of Lua installation (default "/usr/local") 24 lua_dir=<path> Path of Lua installation (default "/usr/local")
26 lua=<lua> Name of the interpreter, may be full path (default "lua") 25 lua=<lua> Name of the interpreter, may be full path (default "lua")
@@ -354,8 +353,6 @@ function test_env.set_args()
354 test_env.CI = true 353 test_env.CI = true
355 elseif argument == "ci-windows" then 354 elseif argument == "ci-windows" then
356 test_env.CI_WINDOWS = true 355 test_env.CI_WINDOWS = true
357 elseif argument == "appveyor" then
358 test_env.APPVEYOR = true
359 elseif argument:find("^os=") then 356 elseif argument:find("^os=") then
360 test_env.TEST_TARGET_OS = argument:match("^os=(.*)$") 357 test_env.TEST_TARGET_OS = argument:match("^os=(.*)$")
361 elseif argument == "mingw" then 358 elseif argument == "mingw" then
@@ -376,12 +373,6 @@ function test_env.set_args()
376 373
377 if dir_sep == "\\" then 374 if dir_sep == "\\" then
378 test_env.TEST_TARGET_OS = "windows" 375 test_env.TEST_TARGET_OS = "windows"
379 if test_env.APPVEYOR then
380 test_env.OPENSSL_INCDIR = "C:\\OpenSSL-v111-Win32\\include"
381 test_env.OPENSSL_LIBDIR = "C:\\OpenSSL-v111-Win32\\lib"
382 if test_env.MINGW then
383 test_env.OPENSSL_LIBDIR = "C:\\OpenSSL-v111-Win32\\bin"
384 end
385 elseif test_env.CI_WINDOWS then 376 elseif test_env.CI_WINDOWS then
386 if test_env.MINGW then 377 if test_env.MINGW then
387 test_env.OPENSSL_INCDIR = "c:\\msys64\\ucrt64\\include" 378 test_env.OPENSSL_INCDIR = "c:\\msys64\\ucrt64\\include"
@@ -686,8 +677,8 @@ local function build_environment(rocks, env_variables)
686 lfs.mkdir(testing_paths.testing_deps_tree) 677 lfs.mkdir(testing_paths.testing_deps_tree)
687 678
688 test_env.run.luarocks_admin_nocov(C("make_manifest", Q(testing_paths.testing_server))) 679 test_env.run.luarocks_admin_nocov(C("make_manifest", Q(testing_paths.testing_server)))
689 test_env.run.luarocks_admin_nocov(C("make_manifest", Q(testing_paths.testing_cache))) 680 test_env.run.luarocks_admin_nocov(C("make_manifest", Q(testing_paths.testing_cache)))
690 681
691 if test_env.MSVCRT then 682 if test_env.MSVCRT then
692 test_env.run.luarocks_nocov(C("config", "variables.MSVCRT", Q(test_env.MSVCRT), Q("--tree=" .. testing_paths.testing_cache))) 683 test_env.run.luarocks_nocov(C("config", "variables.MSVCRT", Q(test_env.MSVCRT), Q("--tree=" .. testing_paths.testing_cache)))
693 end 684 end