diff --git a/utils/dockerbuilds/travis/Dockerfile-base-mingw b/utils/dockerbuilds/travis/Dockerfile-base-mingw index 13dc4c163b1..508b924de5a 100644 --- a/utils/dockerbuilds/travis/Dockerfile-base-mingw +++ b/utils/dockerbuilds/travis/Dockerfile-base-mingw @@ -2,7 +2,7 @@ FROM rwgrim/msys2-cross ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ - apt-get install -y scons g++-mingw-w64-x86-64 pkg-config python3-pefile expect python3-pip nsis gettext && \ + apt-get install -y scons g++-mingw-w64-x86-64 pkg-config python3-pefile expect python3-pip nsis gettext git && \ pip3 install --upgrade pip && \ yes | pip3 install paramiko && \ update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix && \ diff --git a/utils/travis/docker_run.sh b/utils/travis/docker_run.sh index b0d25e00d3f..0aa6891c0a2 100755 --- a/utils/travis/docker_run.sh +++ b/utils/travis/docker_run.sh @@ -81,11 +81,15 @@ elif [ "$LTS" == "mingw" ]; then fi if [ "$TRAVIS_TAG" != "" ]; then - echo "Creating installer for tag: $TRAVIS_TAG" + echo "Creating Windows installer for tag: $TRAVIS_TAG" scons translations build=release --debug=time nls=true jobs=2 || exit 1 python3 ./utils/dockerbuilds/mingw/get_dlls.py || exit 1 scons windows-installer arch=x86-64 prefix=/windows/mingw64 gtkdir=/windows/mingw64 host=x86_64-w64-mingw32 || exit 1 ./utils/travis/sftp "$(find . -type f -regex '.*win64.*')" + echo "Creating .tar.bz2 for tag: $TRAVIS_TAG" + git archive --format=tar --prefix="wesnoth-$TRAVIS_TAG/" $BRANCH > "wesnoth-$TRAVIS_TAG.tar" || exit 1 + bzip2 wesnoth-$TRAVIS_TAG.tar || exit 1 + ./utils/travis/sftp wesnoth-$TRAVIS_TAG.tar.bz2 || exit 1 fi elif [ "$LTS" == "steamrt" ]; then scons ctool=$CC cxxtool=$CXX boostdir=/usr/local/include boostlibdir=/usr/local/lib extra_flags_config=-lrt \ diff --git a/utils/travis/steps/install.sh b/utils/travis/steps/install.sh index 6bb5f888fa5..8ab643304c3 100755 --- a/utils/travis/steps/install.sh +++ b/utils/travis/steps/install.sh @@ -49,8 +49,12 @@ elif [ "$TRAVIS_OS_NAME" = "windows" ]; then ./utils/travis/windows-file-hasher.sh "projectfiles/VC14/$OPT/filehashes.sqlite" else + # if not doing translations, save a bit of time by not copying them into the docker image + # otherwise, if this is the mingw job, the .git directory is needed for running the git archive command if [ "$NLS" == "false" ]; then echo "po/" >> .dockerignore + elif [ "$LTS" == "mingw" ]; then + rm .dockerignore fi echo "FROM wesnoth/wesnoth:$LTS-$BRANCH" > utils/dockerbuilds/travis/Dockerfile-travis-"$LTS"-"$BRANCH"