incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix CI build steps

Browse Source
This commit is contained in:
Martin Michelsen
2025-05-26 14:17:47 -07:00
parent cc99050964
commit 9c675a14ab
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/cmake.yml
+2 -2
View File
@@ -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
Dockerfile
+2 -2
View File
@@ -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
# --- # ---
@@ -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