From a38f561d7ceb71ff95b804f7ea9aabed798c56af Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 16 Oct 2019 02:18:12 +0300 Subject: [PATCH] ci: use SDL2 zip source archive --- .cirrus.yml | 3 +++ .travis.yml | 2 ++ scripts/travis_linux_deps.sh | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 5d800106..879bd5e3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -3,6 +3,7 @@ task: freebsd_instance: image: freebsd-10-4-release-amd64 setup_script: + - git submodule update --init --recursive - ./scripts/travis_linux_deps.sh test_script: - ./scripts/build_freebsd_engine.sh dedicated @@ -13,6 +14,7 @@ task: freebsd_instance: image: freebsd-11-3-stable-amd64-v20190801 setup_script: + - git submodule update --init --recursive - ./scripts/travis_linux_deps.sh test_script: - ./scripts/build_freebsd_engine.sh dedicated @@ -23,6 +25,7 @@ task: freebsd_instance: image: freebsd-12-0-release-amd64 setup_script: + - git submodule update --init --recursive - ./scripts/travis_linux_deps.sh test_script: - ./scripts/build_freebsd_engine.sh dedicated diff --git a/.travis.yml b/.travis.yml index bc1735cf..d44912a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,7 @@ jobs: - libstdc++6:i386 - libfuse2:i386 - zlib1g:i386 + - unzip before_script: - export ARCH=i686 - sh scripts/travis_common_deps.sh @@ -62,6 +63,7 @@ jobs: - libasound-dev - libstdc++6 - libfuse2 + - unzip4 before_script: - export ARCH=x86_64 - sh scripts/travis_common_deps.sh diff --git a/scripts/travis_linux_deps.sh b/scripts/travis_linux_deps.sh index 6f8421f0..e255ffe0 100755 --- a/scripts/travis_linux_deps.sh +++ b/scripts/travis_linux_deps.sh @@ -1,3 +1,4 @@ # SDL2 sources. We will build our own version -curl -s http://libsdl.org/release/SDL2-$SDL_VERSION.tar.gz | tar xzf - +curl http://libsdl.org/release/SDL2-$SDL_VERSION.zip -o SDL2.zip +unzip -x SDL2.zip mv SDL2-$SDL_VERSION SDL2_src