-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJbGrPQAAoJEOPQILQNRairRBoP+wQp3KG8pBYRjYWCUYBCcNrO
 5YgjtI7aEZfjo7mp56a7aYlXHmJpd8zPwR7xC9dwkA7/WzH6Pd6Lz5rz1cZq0KS7
 b+xwv834FRcGP17t7wKh1YqC8cvaL5UxgIIWvsk8L8W8wvt5ZwWXWkWGvUHfCgsp
 yZAjODJHBqUpkVSyCoOPgK8H02iY2wLAhQz1wZDRVyst9oFmNw0bgKprzyYaJrSd
 TkZL+1NZB9emCXBhW54Rh31hBnil5X7BJYvm9gNoEy9NO30uO+M1Z+HtRqY2z/kY
 VeCbk6oIvqQbqX/gbaNDWXhnnYcNJS6T7f6kob0Iu6m0FiCeW7e0PoYit4XmlLvQ
 XuXHx3BMLDYBamMbthEBLZ7iE37df31j+wo26dEj69Ax9lye4xzKEdu7Ke7uPL1C
 DaxInqxdp5DSdzu1CJcKPKpSJbJNslKP3nDPGOEGG119ujBQihV7CfmEbzgi/Py4
 BmK2sBKheRAiPrtbvjDq/HxTMbcjDvZMhqlYur4qNOQsWdei2UfWiRgOY8CFGKdt
 qVDkl/klYAihdYLy9Kh3I3TtbDN/VyRTE+I7O80RgxKB/UYzkTZABuIycsxLhaCp
 45FtPaetBuUUNYl26TTX/tIeEov7MQnvoPidzfg2ldTcswmZV4uz1RGZ7/odxVuV
 VN3VD8zCd6he0EYxdSqH
 =p5+M
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJbGrPRAAoJEOPQILQNRairLs8P/37fPm1PQIatry/RovNGzu9Q
 CwZEJJDocVz6wc5d9XJoFr5pXnkj0jHzbMd7Bw1JI3/nAnY6H79gKJnK/KJluKkx
 vI79iKmTQyjb4r2mJt9k9XPevDkQlAxFTEpkvP/uAGhqkArQlUbLV1Hp9wPf6oH3
 Qn9mrGi68/h/ENiYpcIAJAbnJj+QUDcHqZeb7c7omX5VKWK3gdl+chBqEqnOCoAm
 1cfKpKDNp3jQHr4dY72MAjYbGBwQRRqRfmwadwjydwKVd22lY4Tc2EnEKRjurlyY
 y/QczFS/0XzPG+Y4Ft11fCkiVJMi/8GJkJZFmCOHi8R49U78Pb5bNpeEbLLRBMCO
 ECMXw/G7YjmlJ1A97AobBAlmGtISNcTT/ia0cgZGEKgZhPmMxNgIIK6ooNYsuOly
 s7M9CYqZ/erH4C94XnJbvWimWbmYai0PwqVb00wOvW4d5vN0YE1Rhq/s4k0UOtnz
 wXpb0acRDVS0sL4m5dyljOBlQ8ChPeJo7+B10yjXj7SBFZ/8XgNtLF+rqQW7Fsyf
 JBgHmj/6nDij4OWa8C8pfv57oXWkMVokopvoChXOWQdiElMF7IyV2wrgAtIsQIKf
 9Sk3pX/E7a2J6cVwrNm/WwlLVWdXNX4PxcK77B7FAXFDxCKBc+fUq3L0jzrKFHAW
 rUWBbzWvK4RHkJO83l67
 =wbJ6
 -----END PGP SIGNATURE-----

Merge tag v0.7.1 into v0.8.x
v0.7.1

# gpg: Signature made Fri 08 Jun 2018 18:50:24 CEST
# gpg:                using RSA key E3D020B40D45A8AB
# gpg: Good signature from "Leandro Lucarella <leandro.lucarella@sociomantic.com>"

* tag 'v0.7.1':
  Update Windows Travis Deploy Regex (#354)
  Deploy binaries to GitHub releases (Linux/MacOS) (#348)
This commit is contained in:
Leandro Lucarella 2018-06-08 18:50:25 +02:00
commit c66fea0fe5
4 changed files with 103 additions and 0 deletions

View File

@ -43,3 +43,55 @@ jobs:
on:
tags: true # must be a git tag
repo: dlang-community/dfmt # must be a tag on dlang-community
- stage: GitHub Release
#if: tag IS present
d: ldc-1.8.0
os: linux
script: echo "Deploying to GitHub releases ..." && ./release.sh
deploy:
provider: releases
api_key: $GH_REPO_TOKEN
file_glob: true
file: bin/dfmt-*.tar.gz
skip_cleanup: true
on:
repo: dlang-community/dfmt
tags: true
- stage: GitHub Release
#if: tag IS present
d: ldc-1.8.0
os: osx
script: echo "Deploying to GitHub releases ..." && ./release.sh
deploy:
provider: releases
api_key: $GH_REPO_TOKEN
file_glob: true
file: bin/dfmt-*.tar.gz
skip_cleanup: true
on:
repo: dlang-community/dfmt
tags: true
- stage: GitHub Release
#if: tag IS present
d: dmd
os: linux
language: generic
sudo: yes
script: echo "Deploying to GitHub releases ..." && ./release-windows.sh
addons:
apt:
packages:
- p7zip-full
- wine
deploy:
provider: releases
api_key: $GH_REPO_TOKEN
file_glob: true
file: bin/dfmt-*.zip
skip_cleanup: true
on:
repo: dlang-community/dfmt
tags: true
stages:
- name: test
if: type = pull_request or (type = push and branch = master)

View File

@ -44,3 +44,6 @@ pkg: dmd
clean:
$(RM) bin/dfmt
release:
./release.sh

25
release-windows.sh Executable file
View File

@ -0,0 +1,25 @@
#!/usr/bin/env bash
# Build the Windows binaries under Linux (requires wine)
set -eux -o pipefail
VERSION=$(git describe --abbrev=0 --tags)
OS=windows
ARCH_SUFFIX="x86"
# Allow the script to be run from anywhere
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $DIR
# Step 1: download the DMD binaries
if [ ! -d dmd2 ] ; then
wget http://downloads.dlang.org/releases/2.x/2.079.0/dmd.2.079.0.windows.7z
7z x dmd.2.079.0.windows.7z > /dev/null
fi
# Step 2: Run DMD via wineconsole
archiveName="dfmt-$VERSION-$OS-$ARCH_SUFFIX.zip"
echo "Building $archiveName"
mkdir -p bin
DC="$DIR/dmd2/windows/bin/dmd.exe" wine cmd /C build.bat
cd bin
zip "$archiveName" dfmt.exe

23
release.sh Executable file
View File

@ -0,0 +1,23 @@
#!/usr/bin/env bash
set -eux -o pipefail
VERSION=$(git describe --abbrev=0 --tags)
ARCH="${ARCH:-64}"
LDC_FLAGS=()
unameOut="$(uname -s)"
case "$unameOut" in
Linux*) OS=linux; LDC_FLAGS=("-flto=full" "-linker=gold" "-static") ;;
Darwin*) OS=osx; LDC_FLAGS+=("-L-macosx_version_min" "-L10.7" "-L-lcrt1.o"); ;;
*) echo "Unknown OS: $unameOut"; exit 1
esac
case "$ARCH" in
64) ARCH_SUFFIX="x86_64";;
32) ARCH_SUFFIX="x86";;
*) echo "Unknown ARCH: $ARCH"; exit 1
esac
archiveName="dfmt-$VERSION-$OS-$ARCH_SUFFIX.tar.gz"
echo "Building $archiveName"
${MAKE:-make} ldc LDC_FLAGS="${LDC_FLAGS[*]}"
tar cvfz "bin/$archiveName" -C bin dfmt