diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 510ea55..683840a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,7 +55,7 @@ jobs: - uses: msys2/setup-msys2@v2 with: update: true - install: base-devel git mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-libevent mingw-w64-x86_64-pcre2 + install: base-devel git mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-libevent mingw-w64-x86_64-pcre2 patch msystem: MINGW64 path-type: inherit - name: Build @@ -80,7 +80,7 @@ jobs: - uses: msys2/setup-msys2@v2 with: update: true - install: base-devel git mingw-w64-i686-gcc mingw-w64-i686-cmake mingw-w64-i686-libevent mingw-w64-i686-pcre2 + install: base-devel git mingw-w64-i686-gcc mingw-w64-i686-cmake mingw-w64-i686-libevent mingw-w64-i686-pcre2 patch msystem: MINGW32 path-type: inherit - name: Build diff --git a/.travis.yml b/.travis.yml index 95929a3..51bb81c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,7 +93,7 @@ jobs: export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start' export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --" export msys2+=" -msys2 -c "\"\$@"\" --" - $msys2 pacman --sync --noconfirm --needed base-devel git mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-libevent mingw-w64-x86_64-pcre2 + $msys2 pacman --sync --noconfirm --needed base-devel git mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-libevent mingw-w64-x86_64-pcre2 patch taskkill //IM gpg-agent.exe //F export PATH=/C/tools/msys64/mingw64/bin:$PATH export MAKE=make @@ -127,7 +127,7 @@ jobs: export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start' export mingw32="$msys2 -mingw32 -full-path -here -c "\"\$@"\" --" export msys2+=" -msys2 -c "\"\$@"\" --" - $msys2 pacman --sync --noconfirm --needed base-devel git mingw-w64-i686-gcc mingw-w64-i686-cmake mingw-w64-i686-libevent mingw-w64-i686-pcre2 + $msys2 pacman --sync --noconfirm --needed base-devel git mingw-w64-i686-gcc mingw-w64-i686-cmake mingw-w64-i686-libevent mingw-w64-i686-pcre2 patch taskkill //IM gpg-agent.exe //F export PATH=/C/tools/msys64/mingw64/bin:$PATH export MAKE=make diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 3ddd462..a48f7e9 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -7,6 +7,7 @@ RUN apk add --no-cache --virtual .build-tools git g++ build-base linux-headers c apk add --no-cache --virtual .build-deps curl-dev rapidjson-dev libevent-dev pcre2-dev yaml-cpp-dev && \ git clone https://github.com/ftk/quickjspp --depth=1 && \ cd quickjspp && \ + git submodule update --init && \ cmake -DCMAKE_BUILD_TYPE=Release . && \ make -j4 && \ install -m644 quickjs/libquickjs.a /usr/lib && \ diff --git a/scripts/build.alpine.release.sh b/scripts/build.alpine.release.sh index 6088041..f8264e5 100644 --- a/scripts/build.alpine.release.sh +++ b/scripts/build.alpine.release.sh @@ -27,6 +27,7 @@ cd .. git clone https://github.com/PerMalmberg/libcron --depth=1 cd libcron +git submodule update --init cmake -DCMAKE_BUILD_TYPE=Release . make -j4 install -m644 libcron/out/Release/liblibcron.a /usr/lib diff --git a/scripts/build.macos.release.sh b/scripts/build.macos.release.sh index 182ba14..79bafe5 100644 --- a/scripts/build.macos.release.sh +++ b/scripts/build.macos.release.sh @@ -27,6 +27,7 @@ cd .. git clone https://github.com/PerMalmberg/libcron --depth=1 cd libcron +git submodule update --init cmake -DCMAKE_BUILD_TYPE=Release . make -j4 install -d /usr/local/include/libcron/ diff --git a/scripts/build.windows.release.sh b/scripts/build.windows.release.sh index 8853a93..312d381 100644 --- a/scripts/build.windows.release.sh +++ b/scripts/build.windows.release.sh @@ -25,6 +25,7 @@ cd .. git clone https://github.com/PerMalmberg/libcron --depth=1 cd libcron +git submodule update --init cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release . make -j4 install -m644 libcron/out/Release/liblibcron.a "$MINGW_PREFIX/lib"