diff --git a/.travis.yml b/.travis.yml index 8429b73..0b06efb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,7 @@ language: node_js +before_install: + - sudo apt-get -qq update + - sudo apt-get install -y g++-multilib node_js: - '6' script: npm run asset-compile diff --git a/tasks/asset-compile.ts b/tasks/asset-compile.ts index 50c0e4d..cddbed1 100644 --- a/tasks/asset-compile.ts +++ b/tasks/asset-compile.ts @@ -66,13 +66,12 @@ async function build () { const stop = keepalive() if (target.platform === 'alpine') { - await runAlpineBuild(target, nexe.version.split('.')[0]) + await runAlpineBuild(target) } else { await nexe.compile(options) } stop() - if (await pathExistsAsync(output)) { await assertNexeBinary(output) const gitRelease = await getLatestGitRelease({ headers }) diff --git a/tasks/docker.ts b/tasks/docker.ts index cc23614..8772606 100644 --- a/tasks/docker.ts +++ b/tasks/docker.ts @@ -5,7 +5,7 @@ import got = require('got') import execa = require('execa') import { appendFileSync } from 'fs' -function alpine (target: NexeTarget, nexeVersion: string) { +function alpine (target: NexeTarget) { return ` FROM ${target.arch === 'x64' ? '' : 'i386/'}alpine:3.4 RUN apk add --no-cache curl make gcc g++ binutils-gold python linux-headers paxctl libgcc libstdc++ git vim tar gzip wget @@ -26,8 +26,8 @@ RUN rm /nexe_temp/\${NODE_VERSION}/out/Release/node && \ `.trim() } -export async function runAlpineBuild (target: NexeTarget, nexeVersion: string) { - await writeFileAsync('Dockerfile', alpine(target, nexeVersion)) +export async function runAlpineBuild (target: NexeTarget) { + await writeFileAsync('Dockerfile', alpine(target)) const outFilename = 'nexe-alpine-build-log.txt' await writeFileAsync(outFilename, '') let output: any = []