Merge pull request #415 from leso-kn/feature/actions-windows

This commit is contained in:
Caleb Maclennan 2023-10-30 22:04:00 +03:00 committed by GitHub
commit 0f37af645c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions

View File

@ -13,22 +13,27 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
luaVersion: [ "5.4", "5.3", "5.2", "5.1", "luajit", "luajit-openresty" ] luaVersion: [ "5.4", "5.3", "5.2", "5.1", "luajit", "luajit-openresty" ]
platform: [ "ubuntu-20.04", "macos-11" ] # "windows-2022" not supported by gh-actions-lua platform: [ "ubuntu-20.04", "macos-11", "windows-2022" ]
runs-on: ${{ matrix.platform }} runs-on: ${{ matrix.platform }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Setup msvc
uses: ilammy/msvc-dev-cmd@v1
if: ${{ !startsWith(matrix.luaVersion, 'luajit') }}
- name: Setup lua - name: Setup lua
uses: leafo/gh-actions-lua@v9 uses: leso-kn/gh-actions-lua@v11-staging
with: with:
luaVersion: ${{ matrix.luaVersion }} luaVersion: ${{ matrix.luaVersion }}
- name: Setup luarocks - name: Setup luarocks
uses: leafo/gh-actions-luarocks@v4 uses: hishamhm/gh-actions-luarocks@master
- name: Make and install - name: Make and install
run: | run: |
export DEBUG=DEBUG
luarocks make -- luasocket-scm-3.rockspec luarocks make -- luasocket-scm-3.rockspec
env:
DEBUG: DEBUG
- name: Run regression tests - name: Run regression tests
shell: bash
run: | run: |
cd test cd test
lua hello.lua lua hello.lua

View File

@ -58,7 +58,7 @@ int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps)
/* binds socket to network interface */ /* binds socket to network interface */
int opt_set_bindtodevice(lua_State *L, p_socket ps) int opt_set_bindtodevice(lua_State *L, p_socket ps)
{ {
#if defined(__APPLE__) || defined(__WIN32__) || defined(_MSC_VER) #ifndef SO_BINDTODEVICE
return luaL_error(L, "SO_BINDTODEVICE is not supported on this operating system"); return luaL_error(L, "SO_BINDTODEVICE is not supported on this operating system");
#else #else
const char *dev = luaL_checkstring(L, 3); const char *dev = luaL_checkstring(L, 3);
@ -68,7 +68,7 @@ int opt_set_bindtodevice(lua_State *L, p_socket ps)
int opt_get_bindtodevice(lua_State *L, p_socket ps) int opt_get_bindtodevice(lua_State *L, p_socket ps)
{ {
#if defined(__APPLE__) || defined(__WIN32__) || defined(_MSC_VER) #ifndef SO_BINDTODEVICE
return luaL_error(L, "SO_BINDTODEVICE is not supported on this operating system"); return luaL_error(L, "SO_BINDTODEVICE is not supported on this operating system");
#else #else
char dev[IFNAMSIZ]; char dev[IFNAMSIZ];