Move OSX package task into build script

This is to match how the other binaries are built. Also made some
changes to make the Docker containers clean up for when you are running
this locally.
This commit is contained in:
Asher 2019-06-06 13:42:10 -05:00
parent 406ec0ba71
commit 04adf14146
No known key found for this signature in database
GPG Key ID: 7BB4BA9C783D2BBC
3 changed files with 43 additions and 23 deletions

View File

@ -27,7 +27,6 @@ before_deploy:
- git config --local user.name "$USER_NAME"
- git config --local user.email "$USER_EMAIL"
- git tag "$VERSION" "$TRAVIS_COMMIT"
- if [[ “$TRAVIS_OS_NAME” == “osx” ]]; then yarn task package $VERSION; fi
deploy:
provider: releases
file_glob: true

View File

@ -21,6 +21,8 @@ const buildServerBinary = register("build:server:binary", async (runner) => {
logger.info("Building with environment", field("env", {
NODE_ENV: process.env.NODE_ENV,
VERSION: process.env.VERSION,
OSTYPE: process.env.OSTYPE,
TARGET: process.env.TARGET,
}));
await ensureInstalled();

View File

@ -1,32 +1,51 @@
#!/bin/bash
set -euxo pipefail
# Variables to be set:
# $IMAGE
# Build using a Docker container using the specified image and version.
function docker_build() {
containerID=$(docker create -it -v $(pwd)/.cache:/src/.cache $IMAGE)
docker start $containerID
docker exec $containerID mkdir -p /src
local image="${1}" ; shift
local version="${1}" ; shift
function exec() {
docker exec $containerID bash -c "$@"
local containerId
containerId=$(docker create --network=host --rm -it -v "$(pwd)"/.cache:/src/.cache "${image}")
docker start "${containerId}"
docker exec "${containerId}" mkdir -p /src
function docker_exec() {
docker exec "${containerId}" bash -c "$@"
}
docker cp ./. $containerID:/src
exec "cd /src && yarn"
exec "cd /src && npm rebuild"
exec "cd /src && NODE_ENV=production VERSION=$VERSION yarn task build:server:binary"
exec "cd /src && yarn task package $VERSION"
docker cp $containerID:/src/release/. ./release/
docker cp ./. "${containerId}":/src
docker_exec "cd /src && yarn"
docker_exec "cd /src && npm rebuild"
docker_exec "cd /src && NODE_ENV=production VERSION=${version} yarn task build:server:binary"
docker_exec "cd /src && yarn task package ${version}"
docker cp "${containerId}":/src/release/. ./release/
docker stop "${containerId}"
}
if [[ "$OSTYPE" == "darwin"* ]]; then
NODE_ENV=production yarn task build:server:binary
function main() {
local version=${VERSION:-}
local ostype=${OSTYPE:-}
if [[ -z "${version}" ]] ; then
>&2 echo "Must set VERSION environment variable"
exit 1
fi
if [[ "${ostype}" == "darwin"* ]]; then
NODE_ENV=production VERSION="${version}" yarn task build:server:binary
yarn task package "${version}"
else
local image
if [[ "$TARGET" == "alpine" ]]; then
IMAGE="codercom/nbin-alpine"
image="codercom/nbin-alpine"
else
IMAGE="codercom/nbin-centos"
image="codercom/nbin-centos"
fi
docker_build
docker_build "${image}" "${version}"
fi
}
main "$@"