Commit 22139c0b authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge remote-tracking branch 'catalyst-oniongit/bug23757'

parents d9321d69 3ae5b32a

.gitlab-ci.yml

+10 −6
Original line number Diff line number Diff line 
before_script:

    - "apt-get update -qq"

    - "apt-get upgrade -y"

    - apt-get update -qq

    - apt-get upgrade -qy



build:

  script:

    - "apt-get install -y --fix-missing git openssh-client asciidoc wget gcc g++ automake cmake make libglib2.0 libglib2.0-dev libigraph0 libigraph0-dev libevent-dev openssl libssl-dev"

    - "sh autogen.sh && ./configure && make"

    - "make check"

    - "make install"

    - apt-get install -qy --fix-missing automake build-essential

      libevent-dev libssl-dev zlib1g-dev

      libseccomp-dev liblzma-dev libscrypt-dev

    - ./autogen.sh

    - ./configure --disable-asciidoc --enable-fatal-warnings

      --disable-silent-rules

    - make check || (e=$?; cat test-suite.log; exit $e)

    - make install



update:

  only:

changes/bug23757

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (testing):

    - Adjust the GitLab CI configuration to more closely match that of Travis

      CI. Fixes bug 23757; bugfix on 0.3.2.2-alpha.