From 975d41ec56660a122cb12c5560e3672961a2a13f Mon Sep 17 00:00:00 2001 From: mpeterv Date: Mon, 23 Nov 2015 19:29:50 +0300 Subject: [PATCH] Replace appveyor.yml with .travis.yml Also fix issue with LuaJIT 2.1 on Python 3 --- .travis.yml | 24 ++++++++++++++++++++++++ appveyor.yml | 21 --------------------- hererocks.py | 2 +- 3 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 .travis.yml delete mode 100644 appveyor.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..f73d377 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,24 @@ +language: c +sudo: false + +cache: + directories: cache + +matrix: + include: + - compiler: ": Lua 5.1" + env: LUA="lua 5.1" + - compiler: ": Lua 5.2" + env: LUA="lua 5.2" + - compiler: ": Lua 5.3" + env: LUA="lua 5.3" + - compiler: ": LuaJIT 2.0" + env: LUA="luajit 2.0" + - compiler: ": LuaJIT 2.1" + env: LUA="luajit 2.1" + +script: + - python hererocks.py here --$LUA -r^ --downloads cache --builds cache + - export PATH=$PATH:$PWD/here/bin + - lua -v + - luarocks --version diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index f488300..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: 1.0.{build} - -shallow_clone: true - -environment: - matrix: - - LUA: 5.1 - - LUA: 5.2 - - LUA: 5.3 - -configuration: MinGW - -platform: x86 - -install: cinst python - -before_build: set PATH=C:\mingw\bin;%PATH% - -build_script: python hererocks.py here --lua "%LUA%" --verbose - -test_script: here\bin\lua -v diff --git a/hererocks.py b/hererocks.py index f8766df..e8828b5 100755 --- a/hererocks.py +++ b/hererocks.py @@ -200,7 +200,7 @@ def fetch(versions, version, temp_dir, targz=True): if clone_command == "git clone" and ref != "master": run_command("git checkout", quote(ref)) - commit = exec_command(True, "git rev-parse HEAD").strip() + commit = exec_command(True, "git rev-parse HEAD").strip().decode("utf-8") return result_dir, [name, "git", url_to_name(repo), url_to_name(commit)] lua_version_regexp = re.compile("^\\s*#define\\s+LUA_VERSION_NUM\\s+50(\d)\\s*$")