Skip to content

Commit

Permalink
Merge pull request #415 from leso-kn/feature/actions-windows
Browse files Browse the repository at this point in the history
  • Loading branch information
alerque authored Oct 30, 2023
2 parents 0bc8c56 + 9c6195e commit 0f37af6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,27 @@ jobs:
fail-fast: false
matrix:
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 }}
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup ’msvc’
uses: ilammy/msvc-dev-cmd@v1
if: ${{ !startsWith(matrix.luaVersion, 'luajit') }}
- name: Setup ‘lua’
uses: leafo/gh-actions-lua@v9
uses: leso-kn/gh-actions-lua@v11-staging
with:
luaVersion: ${{ matrix.luaVersion }}
- name: Setup ‘luarocks’
uses: leafo/gh-actions-luarocks@v4
uses: hishamhm/gh-actions-luarocks@master
- name: Make and install
run: |
export DEBUG=DEBUG
luarocks make -- luasocket-scm-3.rockspec
env:
DEBUG: DEBUG
- name: Run regression tests
shell: bash
run: |
cd test
lua hello.lua
Expand Down
4 changes: 2 additions & 2 deletions src/options.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps)
/* binds socket to network interface */
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");
#else
const char *dev = luaL_checkstring(L, 3);
Expand All @@ -68,7 +68,7 @@ int opt_set_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");
#else
char dev[IFNAMSIZ];
Expand Down

0 comments on commit 0f37af6

Please sign in to comment.