parent
90fc52e2b8
commit
0b82bcc53e
|
@ -6,7 +6,7 @@ test:alpine:
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- apk update
|
- apk update
|
||||||
- apk add make gcc git musl-dev openssl-dev linux-headers zlib-dev lua5.2-dev
|
- apk add make gcc git musl-dev openssl-dev linux-headers zlib-dev lua5.3-dev
|
||||||
- make -j$(nproc) check
|
- make -j$(nproc) check
|
||||||
tags:
|
tags:
|
||||||
- docker-alpine
|
- docker-alpine
|
||||||
|
@ -16,7 +16,7 @@ test:debian:
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- apt-get update
|
- apt-get update
|
||||||
- apt-get install -y make gcc git libssl-dev zlib1g-dev lua5.2-dev sudo
|
- apt-get install -y make gcc git libssl-dev zlib1g-dev lua5.3-dev sudo
|
||||||
- unlink /bin/sh
|
- unlink /bin/sh
|
||||||
- ln -s /bin/bash /bin/sh
|
- ln -s /bin/bash /bin/sh
|
||||||
- make -j$(nproc) check
|
- make -j$(nproc) check
|
||||||
|
|
|
@ -15,7 +15,7 @@ before_install:
|
||||||
- alpine() { /alpine/enter-chroot -u "$USER" "$@"; }
|
- alpine() { /alpine/enter-chroot -u "$USER" "$@"; }
|
||||||
install:
|
install:
|
||||||
- sudo sh alpine-chroot-install -a "$ARCH" -b v3.10
|
- sudo sh alpine-chroot-install -a "$ARCH" -b v3.10
|
||||||
-p 'build-base alpine-sdk linux-headers lua5.2-dev openssl openssl-dev zlib-dev'
|
-p 'build-base alpine-sdk linux-headers lua5.3-dev openssl openssl-dev zlib-dev'
|
||||||
before_script:
|
before_script:
|
||||||
- /alpine/enter-chroot sh -c "addgroup $USER wheel && addgroup $USER abuild"
|
- /alpine/enter-chroot sh -c "addgroup $USER wheel && addgroup $USER abuild"
|
||||||
- alpine abuild-keygen -ain
|
- alpine abuild-keygen -ain
|
||||||
|
|
|
@ -9,7 +9,7 @@ ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib)
|
||||||
|
|
||||||
# lua module
|
# lua module
|
||||||
ifneq ($(LUAAPK),)
|
ifneq ($(LUAAPK),)
|
||||||
LUA_VERSION ?= 5.2
|
LUA_VERSION ?= 5.3
|
||||||
LUA_PC ?= lua$(LUA_VERSION)
|
LUA_PC ?= lua$(LUA_VERSION)
|
||||||
LUA_LIBDIR ?= /usr/lib/lua/$(LUA_VERSION)
|
LUA_LIBDIR ?= /usr/lib/lua/$(LUA_VERSION)
|
||||||
LIBAPK := YesPlease
|
LIBAPK := YesPlease
|
||||||
|
|
|
@ -46,6 +46,11 @@ static int typerror (lua_State *L, int narg, const char *tname) {
|
||||||
return luaL_argerror(L, narg, msg);
|
return luaL_argerror(L, narg, msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
time_t apk_time(void)
|
||||||
|
{
|
||||||
|
return time(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
static apk_blob_t check_blob(lua_State *L, int index)
|
static apk_blob_t check_blob(lua_State *L, int index)
|
||||||
{
|
{
|
||||||
apk_blob_t blob;
|
apk_blob_t blob;
|
||||||
|
|
Loading…
Reference in New Issue