fix CI build steps
This commit is contained in:
@@ -22,12 +22,12 @@ jobs:
|
|||||||
|
|
||||||
- name: Install libraries (Linux)
|
- name: Install libraries (Linux)
|
||||||
if: ${{ matrix.os == 'ubuntu-latest' }}
|
if: ${{ matrix.os == 'ubuntu-latest' }}
|
||||||
run: sudo apt-get install -y libevent-dev
|
run: sudo apt-get install -y cmake libasio-dev
|
||||||
|
|
||||||
- name: Install libraries (macOS)
|
- name: Install libraries (macOS)
|
||||||
if: ${{ matrix.os == 'macos-latest' }}
|
if: ${{ matrix.os == 'macos-latest' }}
|
||||||
run: |
|
run: |
|
||||||
brew install libevent
|
brew install cmake asio libiconv
|
||||||
|
|
||||||
cat << EOF > nproc
|
cat << EOF > nproc
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|||||||
+8
-8
@@ -11,7 +11,7 @@ RUN apt update && apt install -y --no-install-recommends \
|
|||||||
make \
|
make \
|
||||||
cmake \
|
cmake \
|
||||||
g++ \
|
g++ \
|
||||||
libevent-dev \
|
libasio-dev \
|
||||||
zlib1g-dev
|
zlib1g-dev
|
||||||
|
|
||||||
# ---
|
# ---
|
||||||
@@ -29,13 +29,13 @@ RUN git clone --depth 1 -b ${PHOSG_TARGET} https://github.com/fuzziqersoftware/p
|
|||||||
sudo make install
|
sudo make install
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
if [ "$BUILD_RESOURCE_DASM" = "true" ] ; then \
|
if [ "$BUILD_RESOURCE_DASM" = "true" ] ; then \
|
||||||
git clone --depth 1 -b ${RESOURCE_DASM_TARGET} https://github.com/fuzziqersoftware/resource_dasm.git && \
|
git clone --depth 1 -b ${RESOURCE_DASM_TARGET} https://github.com/fuzziqersoftware/resource_dasm.git && \
|
||||||
cd resource_dasm && \
|
cd resource_dasm && \
|
||||||
cmake . && \
|
cmake . && \
|
||||||
make -j$(nproc) && \
|
make -j$(nproc) && \
|
||||||
sudo make install \
|
sudo make install \
|
||||||
; fi
|
; fi
|
||||||
|
|
||||||
# ---
|
# ---
|
||||||
|
|
||||||
@@ -53,10 +53,10 @@ RUN cmake -B $PWD/build -DCMAKE_BUILD_TYPE=${BUILD_TYPE} && \
|
|||||||
sudo make -C build install
|
sudo make -C build install
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
if [ "$BUILD_STRIP" = "true" ] ; then \
|
if [ "$BUILD_STRIP" = "true" ] ; then \
|
||||||
strip /usr/local/lib/*.a && \
|
strip /usr/local/lib/*.a && \
|
||||||
strip /usr/local/bin/* \
|
strip /usr/local/bin/* \
|
||||||
; fi
|
; fi
|
||||||
|
|
||||||
# ---
|
# ---
|
||||||
|
|
||||||
@@ -72,7 +72,7 @@ RUN cp -f system/config.example.json system/config.json && \
|
|||||||
FROM ${BASE_IMAGE} AS final
|
FROM ${BASE_IMAGE} AS final
|
||||||
|
|
||||||
RUN apt update && apt install -y --no-install-recommends \
|
RUN apt update && apt install -y --no-install-recommends \
|
||||||
libevent-dev \
|
libasio-dev \
|
||||||
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
|
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
|
||||||
|
|
||||||
WORKDIR /newserv
|
WORKDIR /newserv
|
||||||
|
|||||||
Reference in New Issue
Block a user