diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76ae9a3..64a84cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,8 @@ jobs: include: - os: "macos-latest" lua-version: "5.4" - - os: "windows-latest" - lua-version: "luajit" + # - os: "windows-latest" + # lua-version: "luajit" runs-on: ${{ matrix.os }} steps: @@ -27,4 +27,5 @@ jobs: - uses: hishamhm/gh-actions-luarocks@master - name: Test run: | + make dev make diff --git a/Makefile b/Makefile index 594b282..8262d98 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,17 @@ -.PHONY: build gen check test +.PHONY: dev build gen check test build: compile check test build +dev: + luarocks install cyan + compile: cyan build luarocks build check: compile tl check -q spec/integ.tl - luacheck emitter.lua + luacheck src/emitter.lua test: compile luarocks test diff --git a/README.md b/README.md index a984c84..b24931d 100644 --- a/README.md +++ b/README.md @@ -203,7 +203,7 @@ emitter:reset() ## Installation -You can copy and past Emitter.tl or Emitter.lua into your project. +You can copy and paste `src/emitter.tl` or `src/emitter.lua` into your project. ## Contributing diff --git a/emitter.tl-dev-1.rockspec b/emitter.tl-dev-1.rockspec index 47139a6..963d561 100644 --- a/emitter.tl-dev-1.rockspec +++ b/emitter.tl-dev-1.rockspec @@ -38,11 +38,11 @@ test = { build = { type = "builtin", modules = { - emitter = "emitter.lua", + emitter = "src/emitter.lua", }, install = { lua = { - emitter = "emitter.tl", + emitter = "src/emitter.tl", }, }, } diff --git a/emitter.lua b/src/emitter.lua similarity index 100% rename from emitter.lua rename to src/emitter.lua diff --git a/emitter.tl b/src/emitter.tl similarity index 100% rename from emitter.tl rename to src/emitter.tl diff --git a/tlconfig.lua b/tlconfig.lua index afe5821..4bea23e 100644 --- a/tlconfig.lua +++ b/tlconfig.lua @@ -1,7 +1,7 @@ return { - build_dir = ".", - source_dir = ".", + build_dir = "src", + source_dir = "src", gen_target = "5.1", gen_compat = "off", - include = { "emitter.tl" }, + include = { "src/emitter.tl" }, }