1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

ci: switch from libmesode to libstrophe

This commit is contained in:
Michael Vetter 2021-10-28 20:07:30 +02:00
parent 16ce42a0db
commit 61cebcdf5b
5 changed files with 11 additions and 12 deletions

View File

@ -23,7 +23,7 @@ packages:
- sqlite3 - sqlite3
sources: sources:
- https://github.com/profanity-im/libmesode.git#0.10.1 - https://github.com/strophe/libstrophe.git#0.11.0
- https://github.com/profanity-im/profanity - https://github.com/profanity-im/profanity
environment: environment:
@ -38,7 +38,7 @@ tasks:
export AUTOCONF_VERSION=2.69 export AUTOCONF_VERSION=2.69
export AUTOMAKE_VERSION=1.16 export AUTOMAKE_VERSION=1.16
cd ~/libmesode cd ~/libstrophe
./bootstrap.sh ./bootstrap.sh
./configure ./configure
make make

View File

@ -29,11 +29,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
python-dev-is-python3 \ python-dev-is-python3 \
libsqlite3-dev libsqlite3-dev
RUN mkdir -p /usr/src/{stabber,libmesode,profanity} RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
WORKDIR /usr/src WORKDIR /usr/src
RUN git clone git://github.com/boothj5/stabber.git RUN git clone git://github.com/boothj5/stabber.git
RUN git clone git://github.com/profanity-im/libmesode.git RUN git clone git://github.com/strophe/libstrophe.git
WORKDIR /usr/src/stabber WORKDIR /usr/src/stabber
RUN ./bootstrap.sh RUN ./bootstrap.sh
@ -41,7 +41,7 @@ RUN ./configure --prefix=/usr --disable-dependency-tracking
RUN make RUN make
RUN make install RUN make install
WORKDIR /usr/src/libmesode WORKDIR /usr/src/libstrophe
RUN ./bootstrap.sh RUN ./bootstrap.sh
RUN ./configure --prefix=/usr RUN ./configure --prefix=/usr
RUN make RUN make

View File

@ -53,9 +53,9 @@ RUN make
RUN make install RUN make install
WORKDIR /usr/src WORKDIR /usr/src
RUN mkdir -p /usr/src/libmesode RUN mkdir -p /usr/src/libstrophe
RUN git clone git://github.com/profanity-im/libmesode.git RUN git clone git://github.com/strophe/libstrophe.git
WORKDIR /usr/src/libmesode WORKDIR /usr/src/libstrophe
RUN ./bootstrap.sh RUN ./bootstrap.sh
RUN ./configure --prefix=/usr RUN ./configure --prefix=/usr
RUN make RUN make

View File

@ -20,7 +20,6 @@ RUN zypper --non-interactive in --no-recommends \
libexpat-devel \ libexpat-devel \
libgcrypt-devel \ libgcrypt-devel \
libgpgme-devel \ libgpgme-devel \
libmesode-devel \
libstrophe-devel \ libstrophe-devel \
libmicrohttpd-devel \ libmicrohttpd-devel \
libnotify-devel \ libnotify-devel \

View File

@ -29,11 +29,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
python-dev \ python-dev \
libsqlite3-dev libsqlite3-dev
RUN mkdir -p /usr/src/{stabber,libmesode,profanity} RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
WORKDIR /usr/src WORKDIR /usr/src
RUN git clone git://github.com/boothj5/stabber.git RUN git clone git://github.com/boothj5/stabber.git
RUN git clone git://github.com/profanity-im/libmesode.git RUN git clone git://github.com/strophe/libstrophe.git
# TODO: Re-enable once libmicrohttpd-dev has been updated. # TODO: Re-enable once libmicrohttpd-dev has been updated.
#WORKDIR /usr/src/stabber #WORKDIR /usr/src/stabber
@ -42,7 +42,7 @@ RUN git clone git://github.com/profanity-im/libmesode.git
#RUN make #RUN make
#RUN make install #RUN make install
WORKDIR /usr/src/libmesode WORKDIR /usr/src/libstrophe
RUN ./bootstrap.sh RUN ./bootstrap.sh
RUN ./configure --prefix=/usr RUN ./configure --prefix=/usr
RUN make RUN make