diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2435dbe..f5e5f4f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,14 +7,15 @@ jobs: strategy: fail-fast: false matrix: + os: [linux, macos] + lua: [lua=5.1, lua=5.2, lua=5.3, lua=5.4, luajit=2.0, luajit=2.1] include: - - lua: lua=5.1 - - lua: lua=5.2 - - lua: lua=5.3 - - lua: lua=5.4 - - lua: luajit=2.0 - - lua: luajit=2.1 - runs-on: ubuntu-22.04 + - os: linux + runner: ubuntu-22.04 + - os: macos + runner: macos-13 + name: ${{ matrix.os }} (${{ matrix.lua }}) + runs-on: ${{ matrix.runner }} steps: # Checks-out the repository under $GITHUB_WORKSPACE. - uses: actions/checkout@v3 @@ -22,14 +23,15 @@ jobs: run: | pip install hererocks hererocks lua_install -r^ --${{ matrix.lua }} - export PATH=$PATH:$PWD/lua_install/bin - luarocks install lua-cjson2 + env: + MACOSX_DEPLOYMENT_TARGET: 11.0 - name: Build lua-simdjson run: | - export PATH=$PATH:$PWD/lua_install/bin + source lua_install/bin/activate luarocks make - name: Run tests run: | - export PATH=$PATH:$PWD/lua_install/bin + source lua_install/bin/activate + luarocks install lua-cjson2 luarocks install busted busted --verbose diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 574f388..0000000 --- a/.travis.yml +++ /dev/null @@ -1,45 +0,0 @@ -language: python - -os: - - linux - -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-7 - -env: - - CXX=g++-7 LUA="lua=5.1" - - CXX=g++-7 LUA="lua=5.2" - - CXX=g++-7 LUA="lua=5.3" - - CXX=g++-7 LUA="lua=5.4" - - CXX=g++-7 LUA="luajit=2.0" - - CXX=g++-7 LUA="luajit=2.1" - -jobs: - include: - - name: "Python 3.7.4 on macOS" - os: osx - osx_image: xcode11.2 # Python 3.7.4 running on macOS 10.14.4 - language: shell # 'language: python' is an error on Travis CI macOS - env: LUA="lua=5.1" - - name: "Python 3.7.4 on macOS" - os: osx - osx_image: xcode11.2 # Python 3.7.4 running on macOS 10.14.4 - language: shell # 'language: python' is an error on Travis CI macOS - env: LUA="lua=5.4" - -before_install: - - pip install hererocks - - hererocks lua_install -r^ --$LUA - - export PATH=$PATH:$PWD/lua_install/bin # Add directory with all installed binaries to PATH - - luarocks install lua-cjson2 - -install: - - luarocks make - - luarocks install busted - -script: - - busted --verbose