From 240590ed5b031f2e29a36cdcfb991555fa3589dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Barna?= Date: Sun, 2 Feb 2020 22:04:59 +0100 Subject: [PATCH 1/2] Try out different travis.yaml approach --- .travis.yml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac5b747..b361ae6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,7 @@ +branches: + except: + - jesse + services: - docker @@ -5,14 +9,21 @@ env: global: - secure: bpzCjKqey2IccjgPU4evjz85h5pnLGxgFXj7FIkNtIbXj2OiZq6sYbMKPyL0hH+qby2xQY9KoXHTaB8YSx1GQilNzLeukRgFOs8HuTqxbT7tirBydxM4bLdKXN0Y6HXkQT4AbFpOA4cdyvNshcwT3P5x6Q5SS29JD1HEAylvEt2T64GzvPzDZ8SWLm7pMwXi5/bsxVpCbLFIt+Z7CJCjOu0OshQV6/1jxmBoC6Na/j014bVUKe2389M5Lzho6RSOW2BJQiDteOuGP7pRCdTqmdnRUwweWDG/X9k/Qfj1+2OZSKSxe+vzzi49neRoP7nLKfhz+TenxLOiBHvaMc1Yt+3WygtU/zN8TK4t8AdXOgRlitkn7Novy9x3c3e2Akg3WW9s0QUYL3iw56ySUrs5nF1zScl+AGgmrnVbiORxI7UlzH8Y0sJVs4N084BVnqrbw2YTyId6qt3a12ax9EeItohEA/YpcT7qebNCkB7ncmLNsp1C9CDFq96cxNbABx4Ri4jC3c87rMICckUR7T91Q9zpIO2QI5a8dwLQ6IHybZMU/Ii9iQQAQfTss+0yEH7aobcL7xXNPJ96I+jV4UarzA3LKLILuTniSAb1+ArlG1VS+HVkIW88rAqebVmp/GnRGKVy+8BjtIDIKvGkOjdoTYXAsKYZh1glfaFGoZ9uZBo= - secure: mgIfuOAnf+mqi7RkqoOoQhHOgfi6KDMe1Whn7Rply4s2l5g/6Z3FsyJ6CXmo7tbx2Jbv3/Boi+u81wCCUtRaC/g60H2UWMXdx1S6cp8IoJH/bk4zuMw/StBHe7gLCQONULvDD3uRyVUBBhfcO68swRGsupp6gaQGFHWrSjVj50TUDBEzudq7AqKax+AHByn1G2yYw9st9QHTUgj6+rtNC+5/zFnp/pL219iq2vDlWuaF1fu+9hzB+k91xGbKIGsM4E36GjjJtcKNQTpNYYHaB7RMIwRKe1OjlXtI12tI88Pk4IBle312fNJ4PV2VYhEMjFby/TUGJbac5t2QSqXGiVfUB6aRBUpOTZvvnZ7uW5pj9HmUgeLUEOek5MwiKVoa+U+v0w229/rr3nMdmSfPxjCLBLN/x66gEw7IwqEqvH5cThnLd/CyMRnMgDuhO9hikN+HO+ZkEzmZqjIclaD48bYCMxkIV9FwtDfkRP9adYsn9vJUVvXfq7132V2zyRoYX94a22AXWFzTvD37r0c2SQvlXXE9ZP1r/IlB+fc6QNS0mzUatUUkaC/NxemjS/DeSKyhsy161WEb1Ywht87LeXJ45idC1qaNSPET7zNKzku73IaUU23Oh8pqJEe5HwgfBlMnQtYxv1TVPaGaELHyjKsldS0LR7+uHm25H1TWkos= - jobs: - #- DEBIAN_VERSION=jesse - - DEBIAN_VERSION=stretch + - "DATE_TAG=$( date '+%Y%m%d' )" + +jobs: + include: + - stage: build-image + env: + #- DEBIAN_VERSION=jesse + - DEBIAN_VERSION=stretch before_install: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - docker pull debian:$DEBIAN_VERSION - - docker build -t jarokelo/debian:$DEBIAN_VERSION -f "${DEBIAN_VERSION}/Dockerfile" . script: - - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && docker push jarokelo/debian:$DEBIAN_VERSION || echo "Not pushing for pull request."' + - docker build -t jarokelo/debian:${DEBIAN_VERSION}-${DATE_TAG} -f "${DEBIAN_VERSION}/Dockerfile" . + +after_success: + - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && docker tag jarokelo/debian:${DEBIAN_VERSION}-${DATE_TAG} jarokelo/debian:${DEBIAN_VERSION} && docker push jarokelo/debian:${DEBIAN_VERSION}-${DATE_TAG} && docker push jarokelo/debian:${DEBIAN_VERSION}' From 2152b6c955dfa939a7a22d5701e0017a58b43045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Barna?= Date: Sun, 2 Feb 2020 22:18:44 +0100 Subject: [PATCH 2/2] Push with commit id on PRs --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b361ae6..8a8df00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ env: - secure: bpzCjKqey2IccjgPU4evjz85h5pnLGxgFXj7FIkNtIbXj2OiZq6sYbMKPyL0hH+qby2xQY9KoXHTaB8YSx1GQilNzLeukRgFOs8HuTqxbT7tirBydxM4bLdKXN0Y6HXkQT4AbFpOA4cdyvNshcwT3P5x6Q5SS29JD1HEAylvEt2T64GzvPzDZ8SWLm7pMwXi5/bsxVpCbLFIt+Z7CJCjOu0OshQV6/1jxmBoC6Na/j014bVUKe2389M5Lzho6RSOW2BJQiDteOuGP7pRCdTqmdnRUwweWDG/X9k/Qfj1+2OZSKSxe+vzzi49neRoP7nLKfhz+TenxLOiBHvaMc1Yt+3WygtU/zN8TK4t8AdXOgRlitkn7Novy9x3c3e2Akg3WW9s0QUYL3iw56ySUrs5nF1zScl+AGgmrnVbiORxI7UlzH8Y0sJVs4N084BVnqrbw2YTyId6qt3a12ax9EeItohEA/YpcT7qebNCkB7ncmLNsp1C9CDFq96cxNbABx4Ri4jC3c87rMICckUR7T91Q9zpIO2QI5a8dwLQ6IHybZMU/Ii9iQQAQfTss+0yEH7aobcL7xXNPJ96I+jV4UarzA3LKLILuTniSAb1+ArlG1VS+HVkIW88rAqebVmp/GnRGKVy+8BjtIDIKvGkOjdoTYXAsKYZh1glfaFGoZ9uZBo= - secure: mgIfuOAnf+mqi7RkqoOoQhHOgfi6KDMe1Whn7Rply4s2l5g/6Z3FsyJ6CXmo7tbx2Jbv3/Boi+u81wCCUtRaC/g60H2UWMXdx1S6cp8IoJH/bk4zuMw/StBHe7gLCQONULvDD3uRyVUBBhfcO68swRGsupp6gaQGFHWrSjVj50TUDBEzudq7AqKax+AHByn1G2yYw9st9QHTUgj6+rtNC+5/zFnp/pL219iq2vDlWuaF1fu+9hzB+k91xGbKIGsM4E36GjjJtcKNQTpNYYHaB7RMIwRKe1OjlXtI12tI88Pk4IBle312fNJ4PV2VYhEMjFby/TUGJbac5t2QSqXGiVfUB6aRBUpOTZvvnZ7uW5pj9HmUgeLUEOek5MwiKVoa+U+v0w229/rr3nMdmSfPxjCLBLN/x66gEw7IwqEqvH5cThnLd/CyMRnMgDuhO9hikN+HO+ZkEzmZqjIclaD48bYCMxkIV9FwtDfkRP9adYsn9vJUVvXfq7132V2zyRoYX94a22AXWFzTvD37r0c2SQvlXXE9ZP1r/IlB+fc6QNS0mzUatUUkaC/NxemjS/DeSKyhsy161WEb1Ywht87LeXJ45idC1qaNSPET7zNKzku73IaUU23Oh8pqJEe5HwgfBlMnQtYxv1TVPaGaELHyjKsldS0LR7+uHm25H1TWkos= - "DATE_TAG=$( date '+%Y%m%d' )" + - "COMMIT_SHORT=$( echo $TRAVIS_COMMIT | head -c8 )" jobs: include: @@ -23,7 +24,8 @@ before_install: - docker pull debian:$DEBIAN_VERSION script: - - docker build -t jarokelo/debian:${DEBIAN_VERSION}-${DATE_TAG} -f "${DEBIAN_VERSION}/Dockerfile" . + - docker build -t jarokelo/debian:${DEBIAN_VERSION}-${COMMIT_SHORT} -t jarokelo/debian:${DEBIAN_VERSION}-${DATE_TAG} -t jarokelo/debian:${DEBIAN_VERSION} -f "${DEBIAN_VERSION}/Dockerfile" . after_success: - - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && docker tag jarokelo/debian:${DEBIAN_VERSION}-${DATE_TAG} jarokelo/debian:${DEBIAN_VERSION} && docker push jarokelo/debian:${DEBIAN_VERSION}-${DATE_TAG} && docker push jarokelo/debian:${DEBIAN_VERSION}' + - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && docker push jarokelo/debian:${DEBIAN_VERSION}-${DATE_TAG} && docker push jarokelo/debian:${DEBIAN_VERSION}' + - '[ "${TRAVIS_PULL_REQUEST}" = "true" ] && docker push jarokelo/debian:${DEBIAN_VERSION}-${COMMIT_SHORT}'