github-ci: don't install libnss/libnspr packages

pull/5722/head
Jason Ish 6 years ago committed by Victor Julien
parent 6dfc888966
commit 4e57b5e665

@ -345,8 +345,6 @@ jobs:
libtool \ libtool \
lz4-devel \ lz4-devel \
make \ make \
nspr-devel \
nss-devel \
nss-softokn-devel \ nss-softokn-devel \
pcre-devel \ pcre-devel \
pkgconfig \ pkgconfig \
@ -420,8 +418,6 @@ jobs:
libtool \ libtool \
lz4-devel \ lz4-devel \
make \ make \
nspr-devel \
nss-devel \
nss-softokn-devel \ nss-softokn-devel \
pcre-devel \ pcre-devel \
pkgconfig \ pkgconfig \
@ -493,8 +489,6 @@ jobs:
libtool \ libtool \
lz4-devel \ lz4-devel \
make \ make \
nspr-devel \
nss-devel \
nss-softokn-devel \ nss-softokn-devel \
pcre-devel \ pcre-devel \
pkgconfig \ pkgconfig \
@ -579,7 +573,7 @@ jobs:
chmod 755 $HOME/.cargo/bin/cbindgen chmod 755 $HOME/.cargo/bin/cbindgen
echo "$HOME/.cargo/bin" >> $GITHUB_PATH echo "$HOME/.cargo/bin" >> $GITHUB_PATH
- run: ./autogen.sh - run: ./autogen.sh
- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests --disable-nss --disable-nspr - run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests
- run: make -j2 - run: make -j2
- run: make dist - run: make dist
- name: Extracting suricata-verify - name: Extracting suricata-verify
@ -961,7 +955,6 @@ jobs:
libnetfilter-queue1 \ libnetfilter-queue1 \
libnfnetlink-dev \ libnfnetlink-dev \
libnfnetlink0 \ libnfnetlink0 \
libnss3-dev \
libpcre3 \ libpcre3 \
libpcre3-dev \ libpcre3-dev \
libpcap-dev \ libpcap-dev \
@ -1025,7 +1018,6 @@ jobs:
libcap-ng0 \ libcap-ng0 \
libmagic-dev \ libmagic-dev \
libjansson-dev \ libjansson-dev \
libnss3-dev \
libgeoip-dev \ libgeoip-dev \
liblua5.1-dev \ liblua5.1-dev \
libhiredis-dev \ libhiredis-dev \
@ -1089,7 +1081,6 @@ jobs:
libcap-ng0 \ libcap-ng0 \
libmagic-dev \ libmagic-dev \
libjansson-dev \ libjansson-dev \
libnss3-dev \
libgeoip-dev \ libgeoip-dev \
liblua5.1-dev \ liblua5.1-dev \
libhiredis-dev \ libhiredis-dev \
@ -1149,8 +1140,6 @@ jobs:
libtool \ libtool \
libyaml \ libyaml \
lua \ lua \
nss \
nspr \
pcre \ pcre \
pkg-config \ pkg-config \
python \ python \
@ -1188,7 +1177,7 @@ jobs:
with: with:
msystem: MINGW64 msystem: MINGW64
update: true update: true
install: git mingw-w64-x86_64-toolchain automake1.16 automake-wrapper autoconf libtool libyaml-devel pcre-devel jansson-devel make mingw-w64-x86_64-libyaml mingw-w64-x86_64-pcre mingw-w64-x86_64-rust mingw-w64-x86_64-jansson mingw-w64-x86_64-nss mingw-w64-x86_64-nspr unzip p7zip python-setuptools mingw-w64-x86_64-python-yaml mingw-w64-x86_64-jq install: git mingw-w64-x86_64-toolchain automake1.16 automake-wrapper autoconf libtool libyaml-devel pcre-devel jansson-devel make mingw-w64-x86_64-libyaml mingw-w64-x86_64-pcre mingw-w64-x86_64-rust mingw-w64-x86_64-jansson unzip p7zip python-setuptools mingw-w64-x86_64-python-yaml mingw-w64-x86_64-jq
# hack: install our own cbindgen system wide as we can't get the # hack: install our own cbindgen system wide as we can't get the
# preinstalled one to be picked up by configure # preinstalled one to be picked up by configure
- name: cbindgen - name: cbindgen

Loading…
Cancel
Save