diff --git a/.travis.yml b/.travis.yml index 9935cb631..81dd2b168 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ env: - secure: "uJuuefmnJUuEH15ZD8xQilibx7EeBvMHBLoIZ8bgGHeleEImBD0XbD1ypvhYJKpviOmw5BkZmc9bVO8DGDEHYbSlIa2xDlF6vGrwgCEaxcMIhOAhv+dW9C/maJVieLOEPM01/fK2qdKESZaLvlopkWmxZwDyMObI9L7AMW9zQD8=" # BINTRAY_USER - secure: "L3aPSNLySPXtWCW+xf8h/AAdquwNgxyTQpYOwexJmTPav82Qx8uQlp1yJkUmt+a+FLZDFfQeMivaHq0311RvuQVmkAJx49DjaddrwqOJut2UPsoVDn1WeuAcSHIXOq/0H+zgFMr/PGY0HXIsw1mTMhgheGJNqg09BvYWROCEAcA=" # BINTRAY_KEY - secure: "sBMVn4C/WRWgoAytEFGx4CC5O55Q63h02AcuBnb1jXcBm0RenoBpzUPtxSseJwDPUA1o/UkuEDDjm3PosT5NF+dvED01VDFMsPVE11K0u6+avYy3jYXqyUEDW3G2o6Wo/2aqNjmd++8jskBdS9+Cx9gaFbgxfzSp0Yfu3oJm/4c=" # GH_TOKEN + - secure: "HPMBtknjHM9CjaEoTVLiNtjg7JxmEZ+6AzqjT1LsA0e52dIlWzcRLVLL4uAR8SqMfR1iSj4lW74DzFXEnJCKa+04hiTp9Z/6zw/tX/mFOkkpz8H2gVttXh68NRHLJSJrRX/5fGCcl7AHypADBaoybjEmwjFxYRZ1Nwf81SwQVik=" # BALTO_TOKEN install: - if [ -a .git/shallow ]; then git fetch --unshallow; fi - docker pull ${BASENAME} || ./travis/docker-build-and-push.sh ${BASENAME} travis/travis-base.Dockerfile @@ -40,25 +41,9 @@ script: - ./travis/skip-pkg.sh || docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME_386} linux32 ./travis/debian-build.sh deb/debian-i386/DIST - ./travis/skip-pkg.sh || docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME_UBUNTU_386} linux32 ./travis/debian-build.sh deb/ubuntu-i386/DIST - ./travis/skip-pkg.sh || docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/docs.sh - - ./travis/skip-pkg.sh || travis/prep-bintray.sh + - ./travis/skip-pkg.sh || travis/push-balto.sh deploy: - - provider: bintray - file: travis/bintray-autobuild-debian.json - user: $BINTRAY_USER - key: $BINTRAY_KEY - skip_cleanup: true - on: - branch: next - condition: $CC = gcc - - provider: bintray - file: travis/bintray-autobuild-ubuntu.json - user: $BINTRAY_USER - key: $BINTRAY_KEY - skip_cleanup: true - on: - branch: next - condition: $CC = gcc - provider: script script: travis/deploy-github-pages.sh skip_cleanup: true @@ -66,6 +51,7 @@ deploy: branch: next condition: $CC = gcc -after_deploy: - - travis/cleanup-bintray.pl i3-autobuild - - travis/cleanup-bintray.pl i3-autobuild-ubuntu +# TODO: implement cleanup if we stick with balto +#after_deploy: +# - travis/cleanup-bintray.pl i3-autobuild +# - travis/cleanup-bintray.pl i3-autobuild-ubuntu diff --git a/travis/bintray-autobuild-debian.json b/travis/bintray-autobuild-debian.json deleted file mode 100644 index d01b7dbaa..000000000 --- a/travis/bintray-autobuild-debian.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "package": { - "name": "i3-wm", - "repo": "i3-autobuild", - "subject": "i3" - }, - - "version": { - "name": "%version%", - "desc": "TODO", - "gpgSign": false - }, - - "files": [ - { - "includePattern": "distbuild/deb/debian-amd64/(.*\\.deb)$", - "matrixParams": { - "deb_distribution": "sid", - "deb_component": "main", - "deb_architecture": "amd64" - }, - "uploadPattern": "$1" - }, - { - "includePattern": "distbuild/deb/debian-i386/(.*\\.deb)$", - "matrixParams": { - "deb_distribution": "sid", - "deb_component": "main", - "deb_architecture": "i386" - }, - "uploadPattern": "$1" - } - ], - - "publish": true -} diff --git a/travis/bintray-autobuild-ubuntu.json b/travis/bintray-autobuild-ubuntu.json deleted file mode 100644 index 4c0d6114c..000000000 --- a/travis/bintray-autobuild-ubuntu.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "package": { - "name": "i3-wm", - "repo": "i3-autobuild-ubuntu", - "subject": "i3" - }, - - "version": { - "name": "%version%", - "desc": "TODO", - "gpgSign": false - }, - - "files": [ - { - "includePattern": "distbuild/deb/ubuntu-amd64/(.*\\.deb)$", - "matrixParams": { - "deb_distribution": "bionic", - "deb_component": "main", - "deb_architecture": "amd64" - }, - "uploadPattern": "$1" - }, - { - "includePattern": "distbuild/deb/ubuntu-i386/(.*\\.deb)$", - "matrixParams": { - "deb_distribution": "bionic", - "deb_component": "main", - "deb_architecture": "i386" - }, - "uploadPattern": "$1" - } - ], - - "publish": true -} diff --git a/travis/prep-bintray.sh b/travis/prep-bintray.sh deleted file mode 100755 index 4ea56dcd4..000000000 --- a/travis/prep-bintray.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -set -e -set -x - -sed -i "s,%version%,$(git describe --tags),g" travis/bintray-autobuild-*.json diff --git a/travis/push-balto.sh b/travis/push-balto.sh new file mode 100644 index 000000000..ffa5ee15a --- /dev/null +++ b/travis/push-balto.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +for fn in distbuild/deb/debian-amd64/*.deb distbuild/deb/debian-i386/*.deb +do + echo "pushing $fn to balto" + curl \ + --header "Authorization: Bearer ${BALTO_TOKEN}" \ + --form "package=@${fn}" \ + --form distribution=all \ + https://i3.baltorepo.com/i3/i3-autobuild/upload/ +done + +for fn in distbuild/deb/ubuntu-amd64/*.deb distbuild/deb/ubuntu-i386/*.deb +do + echo "pushing $fn to balto" + curl \ + --header "Authorization: Bearer ${BALTO_TOKEN}" \ + --form "package=@${fn}" \ + --form distribution=all \ + https://i3.baltorepo.com/i3/i3-autobuild-ubuntu/upload/ +done