From 8ae97ee350de57a68e6343155df54df76aebf80d Mon Sep 17 00:00:00 2001 From: Gorka Lerchundi Osa Date: Mon, 9 Nov 2015 09:18:13 +0100 Subject: [PATCH 1/2] use git+sha1 ref as source to easily test on-demand commits --- skarnet-builder/build-latest | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/skarnet-builder/build-latest b/skarnet-builder/build-latest index 8b35efb..5cab8f8 100755 --- a/skarnet-builder/build-latest +++ b/skarnet-builder/build-latest @@ -89,10 +89,17 @@ manifests[skarnet_portable_packages]="manifest-portable.txt" build_install_skarnet_package() { local package=$1 + local version=${versions[$package]} + cd "$BUILDDIR" - curl -R -L -O -C - "http://skarnet.org/software/${package}/${package}-${versions[$package]}.tar.gz" - tar xf "${package}-${versions[$package]}.tar.gz" - cd "${package}-${versions[$package]}" + + git clone git://git.skarnet.org/${package} + cd ${package} + if [[ ${version} =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + version=$(git rev-list -n 1 v${version}) + fi + git reset --hard ${version} + CC="$PACKAGEDIR/musl/bin/musl-gcc" ./configure \ --prefix=/usr \ --libdir=/usr/lib \ @@ -175,20 +182,23 @@ for package in "${skarnet_all_packages[@]}"; do done # generate release.md -echo "Built using \`make-${versions[make]}\`, \`musl-${versions[musl]}\` and \`linux-headers-${versions[linux]}\`" >> $DISTDIR/release.md -echo "" >> $DISTDIR/release.md -echo "| Software | Version |" >> $DISTDIR/release.md -echo "| -------- |:-------:|" >> $DISTDIR/release.md +releasemsg="" +releasemsg+="Built using \`make-${versions[make]}\`, \`musl-${versions[musl]}\` and \`linux-headers-${versions[linux]}\`\n" +releasemsg+="\n" +releasemsg+="| Software | Version |\n" +releasemsg+="| -------- |:-------:|\n" for package in "${skarnet_all_packages[@]}"; do - echo "| ${package} | ${versions[${package}]} |" >> $DISTDIR/release.md + releasemsg+="| ${package} | ${versions[${package}]} |\n" done +echo ${releasemsg} > $DISTDIR/release.md # generate manifests for i in "${!manifests[@]}"; do file="$DISTDIR/${manifests[${i}]}" + manifest="" packages="$i[@]" for package in "${!packages}"; do - echo "${package}=${versions[${package}]}" >> $file + manifest+="${package}=${versions[${package}]}\n" done - echo "" >> $file + echo ${manifest} > $file done From eac27acb7bbfedc0638807772aa9830d2fb92928 Mon Sep 17 00:00:00 2001 From: Gorka Lerchundi Osa Date: Mon, 9 Nov 2015 09:20:18 +0100 Subject: [PATCH 2/2] add a release description & be more verbose --- .travis.yml.after_success | 21 ++++++++++++++++++--- .travis.yml.install | 2 ++ .travis.yml.script | 2 ++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.travis.yml.after_success b/.travis.yml.after_success index 1ec7904..dcc3151 100644 --- a/.travis.yml.after_success +++ b/.travis.yml.after_success @@ -13,16 +13,31 @@ USERNAME=$(echo ${TRAVIS_REPO_SLUG} | cut -d"/" -f1) REPONAME=$(echo ${TRAVIS_REPO_SLUG} | cut -d"/" -f2) # release -./github-release release --user "${USERNAME}" --repo "${REPONAME}" --tag "${TRAVIS_TAG}" --name "${TRAVIS_TAG}" +./github-release release \ + --user "${USERNAME}" \ + --repo "${REPONAME}" \ + --tag "${TRAVIS_TAG}" \ + --name "${TRAVIS_TAG}" \ + --description "$(cat $HOME/dist/release.md)" # manifests for i in $HOME/dist/manifest*.txt; do name=$(basename ${i}) - ./github-release upload --user "${USERNAME}" --repo "${REPONAME}" --tag "${TRAVIS_TAG}" --name "${name}" --file "${i}" + ./github-release upload \ + --user "${USERNAME}" \ + --repo "${REPONAME}" \ + --tag "${TRAVIS_TAG}" \ + --name "${name}" \ + --file "${i}" done # skaware binaries for i in $HOME/dist/*.tar.gz; do name=$(basename ${i}) - ./github-release upload --user "${USERNAME}" --repo "${REPONAME}" --tag "${TRAVIS_TAG}" --name "${name}" --file "${i}" + ./github-release upload \ + --user "${USERNAME}" \ + --repo "${REPONAME}" \ + --tag "${TRAVIS_TAG}" \ + --name "${name}" \ + --file "${i}" done diff --git a/.travis.yml.install b/.travis.yml.install index ecd32bf..0886679 100644 --- a/.travis.yml.install +++ b/.travis.yml.install @@ -1,4 +1,6 @@ #!/bin/bash +set -e +set -x # download and untar github-release wget -nv -O github-release.amd64.tar.bz2 https://github.com/aktau/github-release/releases/download/v0.6.2/linux-amd64-github-release.tar.bz2 diff --git a/.travis.yml.script b/.travis.yml.script index 1e85242..da8cfc8 100644 --- a/.travis.yml.script +++ b/.travis.yml.script @@ -1,3 +1,5 @@ #!/bin/bash +set -e +set -x cd skarnet-builder && ./build-wrapper