Skip to content

Commit

Permalink
remove ncurses (#628)
Browse files Browse the repository at this point in the history
* remove ncurses

* -y to choco
  • Loading branch information
MisterTea authored Apr 5, 2024
1 parent 0f5b53d commit 76cd0ec
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 14 deletions.
1 change: 0 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends \
libboost-dev \
libsodium-dev \
libncurses5-dev \
libprotobuf-dev \
protobuf-compiler \
libgflags-dev \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/novcpkg_build_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ jobs:
sudo apt-get install --no-install-recommends \
libboost-dev \
libsodium-dev \
libncurses5-dev \
libprotobuf-dev \
protobuf-compiler \
libgflags-dev \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/novcpkg_build_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
sudo apt-get install --no-install-recommends \
libboost-dev \
libsodium-dev \
libncurses5-dev \
libprotobuf-dev \
protobuf-compiler \
libgflags-dev \
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/vcpkg_build_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ jobs:
sudo apt-get install --no-install-recommends \
libboost-dev \
libsodium-dev \
libncurses5-dev \
libprotobuf-dev \
protobuf-compiler \
libgflags-dev \
Expand All @@ -60,7 +59,7 @@ jobs:
libunwind-dev
if: matrix.os == 'ubuntu-latest'
- name: Install Dependencies (Windows)
run: choco install ninja
run: choco install -y ninja
if: matrix.os == 'windows-latest'
- name: Install Dependencies (macOS)
run: brew update && brew install ninja cmake
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/vcpkg_build_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ jobs:
sudo apt-get install --no-install-recommends \
libboost-dev \
libsodium-dev \
libncurses5-dev \
libprotobuf-dev \
protobuf-compiler \
libgflags-dev \
Expand All @@ -62,7 +61,7 @@ jobs:
libunwind-dev
if: matrix.os == 'ubuntu-latest'
- name: Install Dependencies (Windows)
run: choco install ninja
run: choco install -y ninja
if: matrix.os == 'windows-latest'
- name: Install Dependencies (macOS)
run: brew update && brew install ninja cmake
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,14 @@ Install dependencies:
* Fedora (tested on 25):

```
sudo dnf install boost-devel libsodium-devel ncurses-devel protobuf-devel \
sudo dnf install boost-devel libsodium-devel protobuf-devel \
protobuf-compiler cmake gflags-devel libcurl-devel
```

* Gentoo:

```
sudo emerge dev-libs/boost dev-libs/libsodium sys-libs/ncurses \
sudo emerge dev-libs/boost dev-libs/libsodium \
dev-libs/protobuf dev-util/cmake dev-cpp/gflags
```

Expand Down Expand Up @@ -227,7 +227,7 @@ Grab the deps and then follow this process.
Debian/Ubuntu Dependencies:

```
sudo apt install libboost-dev libsodium-dev libncurses5-dev \
sudo apt install libboost-dev libsodium-dev \
libprotobuf-dev protobuf-compiler libgflags-dev libutempter-dev libcurl4-openssl-dev \
build-essential ninja-build cmake git zip
```
Expand Down Expand Up @@ -255,7 +255,7 @@ Once built, the binary only requires `libgflags-dev` and `libprotobuf-dev`.
Install dependencies:
```
sudo yum install epel-release
sudo yum install cmake3 boost-devel libsodium-devel ncurses-devel protobuf-devel \
sudo yum install cmake3 boost-devel libsodium-devel protobuf-devel \
protobuf-compiler gflags-devel protobuf-lite-devel libcurl-devel \
perl-IPC-Cmd perl-Data-Dumper libunwind-devel libutempter-devel
```
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.client
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM centos:8 as base

ENV BUILD_REPOS="epel-release centos-release-scl" \
BUILD_DEPS="cmake3 boost-devel libsodium-devel ncurses-devel protobuf-devel \
BUILD_DEPS="cmake3 boost-devel libsodium-devel protobuf-devel \
protobuf-compiler gflags-devel protobuf-lite-devel git \
perl-IPC-Cmd perl-Data-Dumper libunwind-devel libutempter-devel \
devtoolset-11 devtoolset-11-libatomic-devel rh-git227"
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.server
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM centos:8 as base

ENV BUILD_REPOS="epel-release centos-release-scl" \
BUILD_DEPS="cmake3 boost-devel libsodium-devel ncurses-devel protobuf-devel \
BUILD_DEPS="cmake3 boost-devel libsodium-devel protobuf-devel \
protobuf-compiler gflags-devel protobuf-lite-devel git \
perl-IPC-Cmd perl-Data-Dumper libunwind-devel libutempter-devel \
devtoolset-11 devtoolset-11-libatomic-devel rh-git227"
Expand Down Expand Up @@ -31,4 +31,4 @@ EXPOSE 2022 2222

ENTRYPOINT ["/bin/container-entrypoint", "server"]

CMD ["--cfgfile=/etc/et.cfg"]
CMD ["--cfgfile=/etc/et.cfg"]

0 comments on commit 76cd0ec

Please sign in to comment.