diff options
| author | Nicolas Williams <nico@cryptonector.com> | 2017-02-23 00:33:08 -0600 |
|---|---|---|
| committer | Nicolas Williams <nico@cryptonector.com> | 2017-02-23 00:33:08 -0600 |
| commit | e7caf68eddef665713907464529df8a71e7d1429 (patch) | |
| tree | 56fd014a58390a236c3e19c611e6f2fbe49c8c21 | |
| parent | c6374b6a1fce85687af3bffd3fa0f9541d174cb9 (diff) | |
Attempt to use builtin Oniguruma for CIs
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Dockerfile | 16 | ||||
| -rw-r--r-- | appveyor.yml | 5 |
3 files changed, 7 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index 922b165a..bcba4269 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ before_script: - which bison - bison --version - autoreconf -if - - ./configure YACC="$(which bison) -y" $COVERAGE + - ./configure --with-oniguruma=builtin YACC="$(which bison) -y" $COVERAGE script: # When using the bison from Debian we need to tell that bison where @@ -16,26 +16,17 @@ RUN apt-get update && \ ruby \ wget \ ruby-dev && \ - wget https://github.com/kkos/oniguruma/archive/v5.9.6.tar.gz -O onig-5.9.6.tar.gz && \ - sha512sum onig-5.9.6.tar.gz | grep 6b048d345e148c9da38af7a8df76d4a358eb3d4db91fa7834076e511f526a63544284f212b0d56badbbd33112c8b458a5fff02bfbbda012ecfe478bc436ea679 && \ - tar zxvf onig-5.9.6.tar.gz && \ - (cd oniguruma-5.9.6 && \ - touch NEWS ChangeLog && \ - autoreconf -i && \ - ./configure --prefix=/usr/local && \ - make && \ - make install ) && \ + git submodule init && \ + git submodule update && \ gem install bundler && \ (cd /app/docs && bundle install) && \ (cd /app && \ autoreconf -i && \ - ./configure --disable-valgrind --enable-all-static --prefix=/usr/local && \ + ./configure --with-oniguruma=builtin --disable-valgrind --enable-all-static --prefix=/usr/local && \ make -j8 && \ make check && \ make install && \ make distclean ) && \ - (cd oniguruma-5.9.6 && \ - make uninstall ) && \ apt-get purge -y \ build-essential \ autoconf \ @@ -46,7 +37,6 @@ RUN apt-get update && \ ruby \ ruby-dev && \ apt-get autoremove -y && \ - rm -rf oniguruma-5.9.6 && \ rm -rf /var/lib/apt/lists/* /var/lib/gems ENTRYPOINT ["/usr/local/bin/jq"] diff --git a/appveyor.yml b/appveyor.yml index e58981e7..3eb57227 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,12 +11,13 @@ install: - C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -Sy pacman-mirrors" - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -Sy" - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S autoconf automake bison flex" - - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-oniguruma mingw-w64-x86_64-oniguruma" + - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S git" + - git submodule update --init --recursive build_script: - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && autoreconf -i" - - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && ./configure --disable-shared --enable-static --enable-all-static" + - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && ./configure --with-onigurum=builtin --disable-shared --enable-static --enable-all-static" - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && make -j8" - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && cat jq.1 | groff -mandoc -Thtml > jq.html" - 7z a jq-package.zip jq.1 jq.html jq.exe |