From f922bf7b8856dc088dcf3e5716a08b6438efb5ff Mon Sep 17 00:00:00 2001 From: Stephen Gaito Date: Tue, 2 Jun 2020 10:47:40 +0000 Subject: [PATCH] test travis 1 --- .travis.yml | 95 ++++++------------------ .travis.yml.macos.20200602 | 111 +++++++++++++++++++++++++++++ buildScripts/travisLinuxAptDoItAll | 14 ++-- 3 files changed, 137 insertions(+), 83 deletions(-) create mode 100644 .travis.yml.macos.20200602 diff --git a/.travis.yml b/.travis.yml index fee06ac..8f44dd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ language: cpp -sudo: true - # for windows *test* of AppImage # see https://docs.travis-ci.com/user/build-matrix/#using-different-programming-languages-per-job # and https://discourse.appimage.org/t/run-appimage-on-windows/177 @@ -14,85 +12,32 @@ branches: except: # do not build tags that we create using the upload.sh script - /^(?i:continuous.*)$/ -# apt: -# update: true -# packages: -# # build tools -# - git -# - pkg-config -# - ruby -# - autoconf -# - libtool -# - cmake -# - make -# - gcc -# - g++ -# - gettext -# - openjdk-8-jre-headless -# - tree -# # dev libraries -# - libcairo-dev -# - libspiro-dev -# - libpng-dev -# - libjpeg-dev -# - poppler-data -# - libpango1.0-dev -# - liblcms2-dev -# - libxml2-dev -# - libuninameslist-dev -# homebrew: -# packages: -# - pdf2html-new -# - autoconf -# - pkg-config -# - git -# - cmake -# - freetype -# # Poppler-specific packages -# - fontconfig -# - jpeg -# - nss -# # libuninameslist-specific packages -# - automake -# - libtool -# # fontforge-specific packages -# - python -# - glib -# - xml2 -# - libspiro -# - gettext -# # pdf2htmlEX-specific packages -# - cairo -# - pango -# sauce_connect: true - -matrix: - fast_finish: true +#matrix: +# fast_finish: true # allow_failures: # - os: osx # Until the build passes, then re-enable. jobs: + fast_finish: true include: -# - stage: build-linux + - stage: build-linux + os: linux + env: + global: DOCKER_FROM="ubuntu:18.04" + services: + - docker + dist: bionic + script: ./buildScripts/travisLinuxAptDoItAll +# - stage: build-osx # os: -# - linux -# env: -# global: -# - DOCKER_FROM="ubuntu:18.04" -# services: -# - docker -# dist: bionic -# script: ./buildScripts/travisLinuxAptDoItAll - - stage: build-osx - os: - - osx - osx_image: xcode10.1 - addons: - homebrew: - update: true - script: - - ./buildScripts/travisHomeBrewDoItAll - - pdf2htmlEX --version +# - osx +# osx_image: xcode10.1 +# addons: +# homebrew: +# update: true +# script: +# - ./buildScripts/travisHomeBrewDoItAll +# - pdf2htmlEX --version # - stage: test # os: # - linux diff --git a/.travis.yml.macos.20200602 b/.travis.yml.macos.20200602 new file mode 100644 index 0000000..fee06ac --- /dev/null +++ b/.travis.yml.macos.20200602 @@ -0,0 +1,111 @@ +language: cpp + +sudo: true + +# for windows *test* of AppImage +# see https://docs.travis-ci.com/user/build-matrix/#using-different-programming-languages-per-job +# and https://discourse.appimage.org/t/run-appimage-on-windows/177 +# and https://docs.travis-ci.com/user/reference/windows/ +# why fuse is not possible on windows: https://superuser.com/questions/179436/is-it-possible-to-use-fuse-with-windows + +compiler: gcc + +branches: + except: # do not build tags that we create using the upload.sh script + - /^(?i:continuous.*)$/ + +# apt: +# update: true +# packages: +# # build tools +# - git +# - pkg-config +# - ruby +# - autoconf +# - libtool +# - cmake +# - make +# - gcc +# - g++ +# - gettext +# - openjdk-8-jre-headless +# - tree +# # dev libraries +# - libcairo-dev +# - libspiro-dev +# - libpng-dev +# - libjpeg-dev +# - poppler-data +# - libpango1.0-dev +# - liblcms2-dev +# - libxml2-dev +# - libuninameslist-dev +# homebrew: +# packages: +# - pdf2html-new +# - autoconf +# - pkg-config +# - git +# - cmake +# - freetype +# # Poppler-specific packages +# - fontconfig +# - jpeg +# - nss +# # libuninameslist-specific packages +# - automake +# - libtool +# # fontforge-specific packages +# - python +# - glib +# - xml2 +# - libspiro +# - gettext +# # pdf2htmlEX-specific packages +# - cairo +# - pango +# sauce_connect: true + +matrix: + fast_finish: true +# allow_failures: +# - os: osx # Until the build passes, then re-enable. + +jobs: + include: +# - stage: build-linux +# os: +# - linux +# env: +# global: +# - DOCKER_FROM="ubuntu:18.04" +# services: +# - docker +# dist: bionic +# script: ./buildScripts/travisLinuxAptDoItAll + - stage: build-osx + os: + - osx + osx_image: xcode10.1 + addons: + homebrew: + update: true + script: + - ./buildScripts/travisHomeBrewDoItAll + - pdf2htmlEX --version +# - stage: test +# os: +# - linux + #- osx + #- windows +# script: ./testScripts/doItAllTravis +#deploy: +# provider: releases +# api_key: +# secure: ALWKAkgeLSPS4ULyTtxU50ZmSICEafCirCQ1YmuVTqe9nrc8E9Jm+4QaBlab5k6v90EpzNvZBnMOiT8cT1Wp2lqJzcGdGMcG49mhRvirdYhXgWuHYnygVgkxEhgejXcQaEiaGPDV3Y1k9MuiAVr8ApjUvIMlY4Hg1y0r7/rqR2fYmen+f+6a87bp5PptwakC9bfoYb92651d0TbugFfKT6TGKlE2jGlQ6On1alzLQ2DXA8coUjwpp4NcDD8OhnYGN/VZWkqckaBrMrHwjJ5FTfy5MGBOqCLzNix8sCGLEeCKkKC8J0nniNJ7+KOu9LJ2uIezKYfaUOJV0kik7F9ErvxjbfSRieako2yaSOR8X39aicTtpbyoXPRSKDU4WYX56vt4Dx7aNrYtP5b/UwWGXZa9MK7rNGJ+hiMDO1AzuyXirzR4RaJXCyC8n5W9ahBZBHCMqd5gMg5sMGPNj3Rgt34+R+nGYssum5wvr+6IKNl57sIoZFCgqviBrw2gJOCqlgOcEk/4ZSehWnXPCk6Gzxvkqkt/dmp8pJLNyvMaWcEZ6CXNHDU8MZS7bASo8Z7eAYvmX0MMjVty8J47expVaJ8M3OFHu6lE6tU8wwfd+Igr2TlWcixqaa3hDMgS+ghwdiZbYuMdR1AyZnEqK3xwvXXPPXrqRsB9xHtczLibkjY= +# file: pdf2htmlEX-newBuildSystem-x86_64.AppImage +# skip_cleanup: true +# on: +# tags: true +# repo: stephengaito/pdf2htmlEX + diff --git a/buildScripts/travisLinuxAptDoItAll b/buildScripts/travisLinuxAptDoItAll index 1abfed3..fb9db48 100755 --- a/buildScripts/travisLinuxAptDoItAll +++ b/buildScripts/travisLinuxAptDoItAll @@ -9,17 +9,15 @@ export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)" ./buildScripts/versionEnvs || travis_terminate 1; ./buildScripts/reportEnvs || travis_terminate 1; -./buildScripts/getBuildTools || travis_terminate 1; -./buildScripts/getDevLibraries || travis_terminate 1; +./buildScripts/getBuildToolsApt || travis_terminate 1; +./buildScripts/getDevLibrariesApt || travis_terminate 1; ./buildScripts/getPoppler || travis_terminate 1; ./buildScripts/buildPoppler || travis_terminate 1; -./buildScripts/installPoppler || travis_terminate 1; ./buildScripts/getFontforge || travis_terminate 1; ./buildScripts/buildFontforge || travis_terminate 1; -./buildScripts/installFontforge || travis_terminate 1; ./buildScripts/buildPdf2htmlEX || travis_terminate 1; ./buildScripts/installPdf2htmlEX || travis_terminate 1; -./buildScripts/createAppImage || travis_terminate 1; -./buildScripts/createDockerImage || travis_terminate 1; -./buildScripts/uploadGitHubRelease || travis_terminate 1; -./buildScripts/uploadDockerImage || travis_terminate 1; +#./buildScripts/createAppImage || travis_terminate 1; +#./buildScripts/createDockerImage || travis_terminate 1; +#./buildScripts/uploadGitHubRelease || travis_terminate 1; +#./buildScripts/uploadDockerImage || travis_terminate 1;