add ubuntu 20.04 to travis (#3989)
This commit is contained in:
parent
c69e77f330
commit
04274d2497
3 changed files with 51 additions and 3 deletions
24
.ci/UbuntuFocal/Dockerfile
Normal file
24
.ci/UbuntuFocal/Dockerfile
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
FROM ubuntu:focal
|
||||||
|
|
||||||
|
RUN apt-get update && \
|
||||||
|
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||||
|
build-essential \
|
||||||
|
ccache \
|
||||||
|
clang-format \
|
||||||
|
cmake \
|
||||||
|
file \
|
||||||
|
g++ \
|
||||||
|
git \
|
||||||
|
liblzma-dev \
|
||||||
|
libprotobuf-dev \
|
||||||
|
libqt5multimedia5-plugins \
|
||||||
|
libqt5sql5-mysql \
|
||||||
|
libqt5svg5-dev \
|
||||||
|
libqt5websockets5-dev \
|
||||||
|
protobuf-compiler \
|
||||||
|
qt5-default \
|
||||||
|
qtmultimedia5-dev \
|
||||||
|
qttools5-dev \
|
||||||
|
qttools5-dev-tools \
|
||||||
|
&& apt-get clean \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
26
.travis.yml
26
.travis.yml
|
@ -28,7 +28,7 @@ jobs:
|
||||||
directories:
|
directories:
|
||||||
- $CACHE
|
- $CACHE
|
||||||
before_install: source .ci/travis-docker.sh --build
|
before_install: source .ci/travis-docker.sh --build
|
||||||
script: RUN --server --test --debug
|
script: RUN --server --debug --test
|
||||||
|
|
||||||
- name: Ubuntu Bionic (Release)
|
- name: Ubuntu Bionic (Release)
|
||||||
if: (branch = master AND NOT type = pull_request) OR tag IS present
|
if: (branch = master AND NOT type = pull_request) OR tag IS present
|
||||||
|
@ -42,6 +42,30 @@ jobs:
|
||||||
before_install: source .ci/travis-docker.sh --build
|
before_install: source .ci/travis-docker.sh --build
|
||||||
script: RUN --server --package $NAME --release
|
script: RUN --server --package $NAME --release
|
||||||
|
|
||||||
|
#Ubuntu Focal (on Docker)
|
||||||
|
- name: Ubuntu Focal (Compile)
|
||||||
|
if: tag IS NOT present
|
||||||
|
os: linux
|
||||||
|
services: docker
|
||||||
|
language: minimal
|
||||||
|
env: NAME=UbuntuFocal CACHE=$HOME/$NAME
|
||||||
|
cache:
|
||||||
|
directories:
|
||||||
|
- $CACHE
|
||||||
|
before_install: source .ci/travis-docker.sh --build
|
||||||
|
script: RUN --server
|
||||||
|
|
||||||
|
- name: Ubuntu Focal (Release)
|
||||||
|
if: (branch = master AND NOT type = pull_request) OR tag IS present
|
||||||
|
os: linux
|
||||||
|
services: docker
|
||||||
|
language: minimal
|
||||||
|
env: NAME=UbuntuFocal CACHE=$HOME/$NAME
|
||||||
|
cache:
|
||||||
|
directories:
|
||||||
|
- $CACHE
|
||||||
|
before_install: source .ci/travis-docker.sh --build
|
||||||
|
script: RUN --server --package $NAME --release
|
||||||
|
|
||||||
#Debian Buster (on Docker)
|
#Debian Buster (on Docker)
|
||||||
- name: Debian Buster (Compile)
|
- name: Debian Buster (Compile)
|
||||||
|
|
|
@ -1091,7 +1091,7 @@ void MainWindow::actCheckCardUpdates()
|
||||||
* bypass app translocation: quarantined application will be started from a temporary directory eg.
|
* bypass app translocation: quarantined application will be started from a temporary directory eg.
|
||||||
* /private/var/folders/tk/qx76cyb50jn5dvj7rrgfscz40000gn/T/AppTranslocation/A0CBBD5A-9264-4106-8547-36B84DB161E2/d/oracle/
|
* /private/var/folders/tk/qx76cyb50jn5dvj7rrgfscz40000gn/T/AppTranslocation/A0CBBD5A-9264-4106-8547-36B84DB161E2/d/oracle/
|
||||||
*/
|
*/
|
||||||
if(dir.absolutePath().startsWith("/private/var/folders")) {
|
if (dir.absolutePath().startsWith("/private/var/folders")) {
|
||||||
dir.setPath("/Applications/");
|
dir.setPath("/Applications/");
|
||||||
} else {
|
} else {
|
||||||
// exit from the Cockatrice application bundle
|
// exit from the Cockatrice application bundle
|
||||||
|
|
Loading…
Reference in a new issue