diff --git a/.travis.yml b/.travis.yml index f4c7417f9..7ce135e68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,12 @@ dist: bionic sudo: required +cache: + directories: + - $HOME/pbuilder-bases matrix: include: - - env: TARGET_OS= +# - env: TARGET_OS=bionic + - env: TARGET_OS=stretch before_install: - "$TRAVIS_BUILD_DIR/travis/$TRAVIS_OS_NAME.$TARGET_OS.before_install" install: diff --git a/travis/linux.bionic.before_install b/travis/linux.bionic.before_install new file mode 120000 index 000000000..7f7cdd5d1 --- /dev/null +++ b/travis/linux.bionic.before_install @@ -0,0 +1 @@ +linux.stretch.before_install \ No newline at end of file diff --git a/travis/linux..install b/travis/linux.bionic.install similarity index 100% rename from travis/linux..install rename to travis/linux.bionic.install diff --git a/travis/linux.bionic.script b/travis/linux.bionic.script new file mode 120000 index 000000000..3153fc353 --- /dev/null +++ b/travis/linux.bionic.script @@ -0,0 +1 @@ +support/script \ No newline at end of file diff --git a/travis/linux..before_install b/travis/linux.stretch.before_install similarity index 100% rename from travis/linux..before_install rename to travis/linux.stretch.before_install diff --git a/travis/linux.stretch.install b/travis/linux.stretch.install new file mode 100755 index 000000000..647998a4a --- /dev/null +++ b/travis/linux.stretch.install @@ -0,0 +1,5 @@ +#!/bin/sh +sudo apt-get install -y \ + debian-archive-keyring \ + dpkg \ + pbuilder diff --git a/travis/linux.stretch.script b/travis/linux.stretch.script new file mode 100755 index 000000000..11afcff97 --- /dev/null +++ b/travis/linux.stretch.script @@ -0,0 +1,28 @@ +#!/bin/sh +set -e + +: ${TARGET_ARCH:=amd64} + +BASETGZ="$HOME/pbuilder-bases/stretch-$TARGET_ARCH.tgz" +MIRROR=http://cdn-fastly.deb.debian.org/debian +KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg + +if [ ! -e "$BASETGZ.stamp" ] +then + mkdir -p "$HOME/pbuilder-bases" + sudo pbuilder --create --basetgz "$BASETGZ" --mirror $MIRROR \ + --distribution stretch --architecture $TARGET_ARCH \ + --debootstrapopts --variant=buildd \ + --debootstrapopts --keyring=$KEYRING \ + --debootstrapopts --include=perl + touch "$BASETGZ.stamp" +else + sudo pbuilder --update --basetgz "$BASETGZ" +fi + +ln -s travis/support.stretch/debian + +DIR="$PWD" +cd .. +dpkg-source -b "$DIR" +env -i sudo pbuilder --build --basetgz "$BASETGZ" *.dsc diff --git a/travis/support/build.gradle b/travis/support.bionic/build.gradle similarity index 100% rename from travis/support/build.gradle rename to travis/support.bionic/build.gradle diff --git a/travis/support.stretch/build.gradle b/travis/support.stretch/build.gradle new file mode 100644 index 000000000..3a2394f34 --- /dev/null +++ b/travis/support.stretch/build.gradle @@ -0,0 +1,20 @@ +buildscript { + repositories { + maven { url "file:///usr/share/maven-repo" } + } + + dependencies { + classpath "com.android.tools.build:gradle:debian" + } +} + +apply plugin: "com.android.application" + +android { + compileSdkVersion 23 + buildToolsVersion "24.0.0" +} + +dependencies { + compile files("libs/android-support-v4.jar") +} diff --git a/travis/support.stretch/debian/changelog b/travis/support.stretch/debian/changelog new file mode 100644 index 000000000..f918bd19e --- /dev/null +++ b/travis/support.stretch/debian/changelog @@ -0,0 +1,5 @@ +andors-trail (0.1) unstable; urgency=low + + * Dummy release. + + -- Javier Serrano Polo Sun, 24 May 2020 00:00:00 +0000 diff --git a/travis/support.stretch/debian/control b/travis/support.stretch/debian/control new file mode 100644 index 000000000..82934ae4f --- /dev/null +++ b/travis/support.stretch/debian/control @@ -0,0 +1,10 @@ +Source: andors-trail +Section: games +Priority: optional +Maintainer: Javier Serrano Polo +Build-Depends: android-sdk, android-sdk-platform-23, apksigner, + default-jdk-headless, gettext, gradle, libgradle-android-plugin-java +Standards-Version: 3.9.8 + +Package: andors-trail +Architecture: all diff --git a/travis/support.stretch/debian/rules b/travis/support.stretch/debian/rules new file mode 100755 index 000000000..e5b8575fb --- /dev/null +++ b/travis/support.stretch/debian/rules @@ -0,0 +1,23 @@ +#!/usr/bin/make -f + +build-indep: build-indep-stamp +build-indep-stamp: + [ -e debian/control ] + travis/support/script + touch $@ + +build: build-indep + +clean: + [ -e debian/control ] + rm -f build-indep-stamp debian/files + cd AndorsTrail && rm -fr *.apk .gradle build build.gradle \ + gradle.properties keystore.p12 local.properties src/main + +binary-indep: build-indep + [ -e debian/control ] + cp -a AndorsTrail/*.apk .. + dpkg-distaddfile $(shell basename AndorsTrail/*.apk) - - + +binary: binary-indep +.PHONY: build-indep build clean binary-indep binary diff --git a/travis/support.stretch/debian/source/format b/travis/support.stretch/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/travis/support.stretch/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/travis/linux..script b/travis/support/script similarity index 70% rename from travis/linux..script rename to travis/support/script index 66a558cfb..83ff7cfc9 100755 --- a/travis/linux..script +++ b/travis/support/script @@ -3,8 +3,10 @@ set -e cd AndorsTrail -ln -s ../travis/support/build.gradle ../travis/support/gradle.properties \ - ../travis/support/local.properties . +: ${TARGET_OS:=stretch} + +ln -s ../travis/support.$TARGET_OS/build.gradle \ + ../travis/support/gradle.properties ../travis/support/local.properties . mkdir -p src/main/assets/translation src/main/java ln -s ../../AndroidManifest.xml ../../res src/main @@ -15,11 +17,7 @@ do msgfmt -o src/main/${po%.po}.mo $po done -mkdir -p "$HOME"/.android -sudo rm /usr/lib/android-sdk/build-tools/27.0.1 -sudo mv /usr/lib/android-sdk/build-tools/debian /usr/lib/android-sdk/build-tools/27.0.1 - -gradle assembleRelease --stacktrace +gradle assembleRelease keytool -genkeypair -v -keystore keystore.p12 -storepass changeit \ -keypass changeit -storetype pkcs12 -alias self -keyalg RSA \