diff --git a/.ci/Fedora29/Dockerfile b/.ci/Fedora29/Dockerfile deleted file mode 100644 index 0107d598..00000000 --- a/.ci/Fedora29/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM fedora:29 - -RUN dnf install -y \ - @development-tools \ - ccache \ - cmake \ - desktop-file-utils \ - file \ - gcc-c++ \ - hicolor-icon-theme \ - libappstream-glib \ - protobuf-devel \ - qt5-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel-5.11.1-2.fc29 \ - rpm-build \ - sqlite-devel \ - wget \ - zlib-devel \ - xz-devel \ - && dnf clean all diff --git a/.travis.yml b/.travis.yml index e285923e..2119de19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ git: matrix: include: + #Ubuntu Xenial (Debug only) - name: Ubuntu Xenial (Debug) if: tag IS NOT present @@ -29,6 +30,7 @@ matrix: - libqt5websockets5-dev script: bash ./.ci/travis-compile.sh --format --server --test --debug + #Ubuntu Bionic (on docker) - name: Ubuntu Bionic (Debug) if: tag IS NOT present @@ -56,32 +58,6 @@ matrix: "cockatrice_${NAME,,}" bash .ci/travis-compile.sh --server --package "$NAME" --release - #Fedora 29 (on docker) - - name: Fedora 29 (Debug) - if: tag IS NOT present - services: docker - env: NAME=Fedora29 - cache: - directories: - - $HOME/$NAME/ - before_install: docker build -t "cockatrice_${NAME,,}" .ci/$NAME && mkdir -p $HOME/$NAME/.ccache - script: docker run --mount "type=bind,source=$(pwd),target=/src" -w="/src" - --mount "type=bind,source=$HOME/$NAME/.ccache,target=/.ccache" -e "CCACHE_DIR=/.ccache" - "cockatrice_${NAME,,}" - bash .ci/travis-compile.sh --server --debug - - - name: Fedora 29 (Release) - if: (branch = master AND NOT type = pull_request) OR tag IS present - services: docker - env: NAME=Fedora29 - cache: - directories: - - $HOME/$NAME/ - before_install: docker build -t "cockatrice_${NAME,,}" .ci/$NAME && mkdir -p $HOME/$NAME/.ccache - script: docker run --mount "type=bind,source=$(pwd),target=/src" -w="/src" - --mount "type=bind,source=$HOME/$NAME/.ccache,target=/.ccache" -e "CCACHE_DIR=/.ccache" - "cockatrice_${NAME,,}" - bash .ci/travis-compile.sh --server --package "$NAME" "RPM" --release #macOS - name: macOS (Debug) @@ -104,7 +80,6 @@ matrix: before_cache: - brew cleanup - - name: macOS (Release) if: (branch = master AND NOT type = pull_request) OR tag IS present os: osx