2 changed files with 5 additions and 10 deletions
Unified View
Diff Options
-
+3 -3.travis.yml
-
+2 -7.travis/before_install.sh
+ 3
- 3
.travis.yml
View File
| @@ -7,7 +7,7 @@ jobs: | |||||
| - name: "Linux native" | - name: "Linux native" | ||||
| os: linux | os: linux | ||||
| compiler: gcc | compiler: gcc | ||||
| dist: bionic | |||||
| dist: focal | |||||
| env: | env: | ||||
| - TARGET="linux" | - TARGET="linux" | ||||
| services: | services: | ||||
| @@ -18,7 +18,7 @@ jobs: | |||||
| #- name: "win32 cross-compilation" | #- name: "win32 cross-compilation" | ||||
| #os: linux | #os: linux | ||||
| #compiler: gcc | #compiler: gcc | ||||
| #dist: bionic | |||||
| #dist: focal | |||||
| #env: | #env: | ||||
| #- TARGET="win32" | #- TARGET="win32" | ||||
| #services: | #services: | ||||
| @@ -29,7 +29,7 @@ jobs: | |||||
| #- name: "win64 cross-compilation" | #- name: "win64 cross-compilation" | ||||
| #os: linux | #os: linux | ||||
| #compiler: gcc | #compiler: gcc | ||||
| #dist: bionic | |||||
| #dist: focal | |||||
| #env: | #env: | ||||
| #- TARGET="win32" | #- TARGET="win32" | ||||
| #services: | #services: | ||||
+ 2
- 7
.travis/before_install.sh
View File
| @@ -13,11 +13,6 @@ if [ "${TARGET}" = "win32" ] || [ "${TARGET}" = "win64" ]; then | |||||
| sudo dpkg --add-architecture i386 | sudo dpkg --add-architecture i386 | ||||
| fi | fi | ||||
| sudo add-apt-repository -y ppa:kxstudio-debian/kxstudio | |||||
| sudo add-apt-repository -y ppa:kxstudio-debian/mingw | |||||
| sudo add-apt-repository -y ppa:kxstudio-debian/toolchain | |||||
| sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test | |||||
| sudo apt-get update -qq | |||||
| sudo apt-get install kxstudio-repos | |||||
| sudo apt-get update -qq | sudo apt-get update -qq | ||||
| sudo apt-get install -y -o APT::Immediate-Configure=false libc6 libc6:i386 libgcc-s1:i386 | |||||
| sudo apt-get install -y -f | |||||