diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f7c3433..47e0ac0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,15 +25,15 @@ jobs: displayName: Install Node inputs: versionSpec: '10.x' - - script: sudo apt-get install -y libc6-dev-i386 gcc-multilib g++-multilib - condition: eq(variables['Agent.JobName'], 'linux') + - script: sudo apt-get update && sudo apt-get install -y libc6-dev-i386 gcc-multilib g++-multilib + condition: contains(variables['Agent.JobName'], 'linux') displayName: Install Linux Build Dependencies - script: choco install visualcpp-build-tools --version 14.0.25420.1 -fy && npm config set msvs_version 2015 - condition: startsWith(variables['Agent.JobName'], 'windows_2015') + condition: contains(variables['Agent.JobName'], 'windows_2015') displayName: Install Windows Build Dependencies - script: choco install nasm -fy displayName: Install Windows Assembler (NASM) - condition: startsWith(variables['Agent.JobName'], 'windows') + condition: contains(variables['Agent.JobName'], 'windows') - script: npm install && npm run ci:build displayName: Build Nexe env: diff --git a/tasks/build.ts b/tasks/build.ts index f42fc49..8b40a2b 100644 --- a/tasks/build.ts +++ b/tasks/build.ts @@ -41,7 +41,7 @@ async function build() { else if (isWindows) target = windowsBuild else if (isMac) target = macBuild else if (isLinux) target = linux - if (buildHost === 'alpine') target = alpine + if (buildHost.includes('alpine')) target = alpine if (!target) { return console.log('Nothing to build...') @@ -67,7 +67,7 @@ async function build() { if ( [/*'arm7l', 'arm6l', 'arm64', */ 'alpine'].includes(target.platform) && - buildHost === 'alpine' + buildHost.includes('alpine') ) { await runDockerBuild(target) } else {