Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ae51cc6b87 | |||
| cf23147c9c | |||
| 9c1d67b2e6 | |||
| 93e0a021d3 | |||
| 021f50d50f | |||
| bf5ff7d9bd | |||
| 86c3acedb1 | |||
| ecb3d41a97 | |||
| 1eb44797d0 |
+22
-3
@@ -1,6 +1,25 @@
|
|||||||
|
schedules:
|
||||||
|
- cron: "0 8 * * *"
|
||||||
|
displayName: "Daily Build 1"
|
||||||
|
always: true
|
||||||
|
branches:
|
||||||
|
include:
|
||||||
|
- master
|
||||||
|
- cron: "0 13 * * *"
|
||||||
|
displayName: "Daily Build 2"
|
||||||
|
always: true
|
||||||
|
branches:
|
||||||
|
include:
|
||||||
|
- master
|
||||||
|
- cron: "0 19 * * *"
|
||||||
|
displayName: "Daily Build 3"
|
||||||
|
always: true
|
||||||
|
branches:
|
||||||
|
include:
|
||||||
|
- master
|
||||||
jobs:
|
jobs:
|
||||||
- job: BaseBuild
|
- job: BaseBuild
|
||||||
timeoutInMinutes: 0
|
timeoutInMinutes: 180
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
linux:
|
linux:
|
||||||
@@ -27,10 +46,10 @@ jobs:
|
|||||||
versionSpec: '10.x'
|
versionSpec: '10.x'
|
||||||
- script: sudo apt-get update && sudo apt-get install -y libc6-dev-i386 gcc-multilib g++-multilib
|
- script: sudo apt-get update && sudo apt-get install -y libc6-dev-i386 gcc-multilib g++-multilib
|
||||||
condition: contains(variables['Agent.JobName'], 'linux')
|
condition: contains(variables['Agent.JobName'], 'linux')
|
||||||
displayName: Install Linux Build Dependencies
|
displayName: Install Linux build dependencies
|
||||||
- script: choco install visualcpp-build-tools --version 14.0.25420.1 -fy && npm config set msvs_version 2015
|
- script: choco install visualcpp-build-tools --version 14.0.25420.1 -fy && npm config set msvs_version 2015
|
||||||
condition: contains(variables['Agent.JobName'], 'windows_2015')
|
condition: contains(variables['Agent.JobName'], 'windows_2015')
|
||||||
displayName: Install Windows Build Dependencies
|
displayName: Install Windows build dependencies
|
||||||
- script: choco install nasm -fy
|
- script: choco install nasm -fy
|
||||||
displayName: Install Windows Assembler (NASM)
|
displayName: Install Windows Assembler (NASM)
|
||||||
condition: contains(variables['Agent.JobName'], 'windows')
|
condition: contains(variables['Agent.JobName'], 'windows')
|
||||||
|
|||||||
Generated
+10
-10
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "nexe",
|
"name": "nexe",
|
||||||
"version": "3.3.0",
|
"version": "3.3.3",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -128,9 +128,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@types/got": {
|
"@types/got": {
|
||||||
"version": "9.4.4",
|
"version": "9.6.0",
|
||||||
"resolved": "https://registry.npmjs.org/@types/got/-/got-9.4.4.tgz",
|
"resolved": "https://registry.npmjs.org/@types/got/-/got-9.6.0.tgz",
|
||||||
"integrity": "sha512-IGAJokJRE9zNoBdY5csIwN4U5qQn+20HxC0kM+BbUdfTKIXa7bOX/pdhy23NnLBRP8Wvyhx7X5e6EHJs+4d8HA==",
|
"integrity": "sha512-t00QebxBllcawe7uMxi9jsfWfbki4+/zpJEPyoGWjUvnFOy4EkAzoYOI2UJt2+Fx0yIcDX2+us93k6ensKTddA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"@types/node": "*",
|
"@types/node": "*",
|
||||||
@@ -3114,9 +3114,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ts-node": {
|
"ts-node": {
|
||||||
"version": "8.2.0",
|
"version": "8.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.3.0.tgz",
|
||||||
"integrity": "sha512-m8XQwUurkbYqXrKqr3WHCW310utRNvV5OnRVeISeea7LoCWVcdfeB/Ntl8JYWFh+WRoUAdBgESrzKochQt7sMw==",
|
"integrity": "sha512-dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"arg": "^4.1.0",
|
"arg": "^4.1.0",
|
||||||
@@ -3202,9 +3202,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"typescript": {
|
"typescript": {
|
||||||
"version": "3.5.1",
|
"version": "3.5.2",
|
||||||
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.1.tgz",
|
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.2.tgz",
|
||||||
"integrity": "sha512-64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw==",
|
"integrity": "sha512-7KxJovlYhTX5RaRbUdkAXN1KUZ8PwWlTzQdHV6xNqvuFOs7+WBo10TQUqT19Q/Jz2hk5v9TQDIhyLhhJY4p5AA==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"unbzip2-stream": {
|
"unbzip2-stream": {
|
||||||
|
|||||||
+4
-4
@@ -2,7 +2,7 @@
|
|||||||
"name": "nexe",
|
"name": "nexe",
|
||||||
"description": "Create a single executable out of your Node.js application",
|
"description": "Create a single executable out of your Node.js application",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"version": "3.3.0",
|
"version": "3.3.3",
|
||||||
"contributors": [
|
"contributors": [
|
||||||
"Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
|
"Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
|
||||||
"Jared Allard <jaredallard@outlook.com>",
|
"Jared Allard <jaredallard@outlook.com>",
|
||||||
@@ -54,7 +54,7 @@
|
|||||||
"@types/download": "^6.2.4",
|
"@types/download": "^6.2.4",
|
||||||
"@types/execa": "^0.9.0",
|
"@types/execa": "^0.9.0",
|
||||||
"@types/globby": "^9.1.0",
|
"@types/globby": "^9.1.0",
|
||||||
"@types/got": "^9.4.4",
|
"@types/got": "^9.6.0",
|
||||||
"@types/minimist": "^1.2.0",
|
"@types/minimist": "^1.2.0",
|
||||||
"@types/mkdirp": "^0.5.2",
|
"@types/mkdirp": "^0.5.2",
|
||||||
"@types/mocha": "^5.2.7",
|
"@types/mocha": "^5.2.7",
|
||||||
@@ -67,10 +67,10 @@
|
|||||||
"execa": "^1.0.0",
|
"execa": "^1.0.0",
|
||||||
"mocha": "^6.1.4",
|
"mocha": "^6.1.4",
|
||||||
"prettier": "^1.18.2",
|
"prettier": "^1.18.2",
|
||||||
"ts-node": "^8.2.0",
|
"ts-node": "^8.3.0",
|
||||||
"tslint": "^5.17.0",
|
"tslint": "^5.17.0",
|
||||||
"tslint-config-prettier": "^1.18.0",
|
"tslint-config-prettier": "^1.18.0",
|
||||||
"tslint-plugin-prettier": "^2.0.1",
|
"tslint-plugin-prettier": "^2.0.1",
|
||||||
"typescript": "^3.5.1"
|
"typescript": "^3.5.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -112,7 +112,7 @@ export class NexeCompiler {
|
|||||||
this.remoteAsset = options.asset
|
this.remoteAsset = options.asset
|
||||||
} else {
|
} else {
|
||||||
this.remoteAsset =
|
this.remoteAsset =
|
||||||
'https://github.com/nexe/nexe/releases/download/v3.0.0/' + this.target.toString()
|
'https://github.com/nexe/nexe/releases/download/v3.3.3/' + this.target.toString()
|
||||||
}
|
}
|
||||||
this.src = join(this.options.temp, this.target.version)
|
this.src = join(this.options.temp, this.target.version)
|
||||||
this.configureScript = configure + (semverGt(this.target.version, '10.10.0') ? '.py' : '')
|
this.configureScript = configure + (semverGt(this.target.version, '10.10.0') ? '.py' : '')
|
||||||
@@ -237,7 +237,7 @@ export class NexeCompiler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private _configureAsync() {
|
private _configureAsync() {
|
||||||
if (isWindows && semverGt(this.target.version, '11.999')) {
|
if (isWindows && semverGt(this.target.version, '10.15.99')) {
|
||||||
return Promise.resolve()
|
return Promise.resolve()
|
||||||
}
|
}
|
||||||
return this._runBuildCommandAsync(this.env.PYTHON || 'python', [
|
return this._runBuildCommandAsync(this.env.PYTHON || 'python', [
|
||||||
|
|||||||
@@ -55,7 +55,13 @@ export default async function main(compiler: NexeCompiler, next: () => Promise<v
|
|||||||
})
|
})
|
||||||
|
|
||||||
const fileLines = file.contents.split('\n')
|
const fileLines = file.contents.split('\n')
|
||||||
fileLines.splice(location.start.line, 0, '{{replace:lib/fs/bootstrap.js}}' + '\n')
|
fileLines.splice(
|
||||||
|
location.start.line,
|
||||||
|
0,
|
||||||
|
'{{replace:lib/fs/bootstrap.js}}' +
|
||||||
|
'\n' +
|
||||||
|
(semverGt(version, '11.99') ? 'expandArgv1 = false;\n' : '')
|
||||||
|
)
|
||||||
file.contents = fileLines.join('\n')
|
file.contents = fileLines.join('\n')
|
||||||
|
|
||||||
if (semverGt(version, '11.99')) {
|
if (semverGt(version, '11.99')) {
|
||||||
|
|||||||
+3
-3
@@ -29,15 +29,15 @@ function isBuildableVersion(version: string) {
|
|||||||
return !versionsToSkip.includes(major) || version === '4.8.4'
|
return !versionsToSkip.includes(major) || version === '4.8.4'
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getLatestGitRelease(options?: any) {
|
export function getV3GitRelease(options?: any) {
|
||||||
return getJson<GitRelease>('https://api.github.com/repos/nexe/nexe/releases/latest', options)
|
return getJson<GitRelease>('https://api.github.com/repos/nexe/nexe/releases/7567580/', options)
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getUnBuiltReleases(options?: any) {
|
export async function getUnBuiltReleases(options?: any) {
|
||||||
const nodeReleases = await getJson<NodeRelease[]>(
|
const nodeReleases = await getJson<NodeRelease[]>(
|
||||||
'https://nodejs.org/download/release/index.json'
|
'https://nodejs.org/download/release/index.json'
|
||||||
)
|
)
|
||||||
const existingVersions = (await getLatestGitRelease(options)).assets.map(x => getTarget(x.name))
|
const existingVersions = (await getV3GitRelease(options)).assets.map(x => getTarget(x.name))
|
||||||
|
|
||||||
const versionMap: { [key: string]: true } = {}
|
const versionMap: { [key: string]: true } = {}
|
||||||
return nodeReleases
|
return nodeReleases
|
||||||
|
|||||||
+5
-2
@@ -1,9 +1,10 @@
|
|||||||
import * as nexe from '../lib/nexe'
|
import * as nexe from '../lib/nexe'
|
||||||
import { getUnBuiltReleases, getLatestGitRelease } from '../lib/releases'
|
import { getUnBuiltReleases, getV3GitRelease } from '../lib/releases'
|
||||||
import { runDockerBuild } from './docker'
|
import { runDockerBuild } from './docker'
|
||||||
import { getTarget, targetsEqual, NexeTarget } from '../lib/target'
|
import { getTarget, targetsEqual, NexeTarget } from '../lib/target'
|
||||||
import { pathExistsAsync, readFileAsync, execFileAsync, semverGt } from '../lib/util'
|
import { pathExistsAsync, readFileAsync, execFileAsync, semverGt } from '../lib/util'
|
||||||
import got = require('got')
|
import got = require('got')
|
||||||
|
import { cpus } from 'os'
|
||||||
|
|
||||||
const env = process.env,
|
const env = process.env,
|
||||||
isPullRequest = env.BUILD_REASON === 'PullRequest',
|
isPullRequest = env.BUILD_REASON === 'PullRequest',
|
||||||
@@ -60,6 +61,7 @@ async function build() {
|
|||||||
build: true,
|
build: true,
|
||||||
verbose: Boolean(env.NEXE_VERBOSE!),
|
verbose: Boolean(env.NEXE_VERBOSE!),
|
||||||
target,
|
target,
|
||||||
|
make: ['-j' + cpus().length],
|
||||||
output
|
output
|
||||||
}
|
}
|
||||||
console.log('Building: ' + target + ' on ' + buildHost)
|
console.log('Building: ' + target + ' on ' + buildHost)
|
||||||
@@ -76,10 +78,11 @@ async function build() {
|
|||||||
stop()
|
stop()
|
||||||
if (await pathExistsAsync(output)) {
|
if (await pathExistsAsync(output)) {
|
||||||
await assertNexeBinary(output)
|
await assertNexeBinary(output)
|
||||||
const gitRelease = await getLatestGitRelease({ headers }),
|
const gitRelease = await getV3GitRelease({ headers }),
|
||||||
unbuiltReleases = await getUnBuiltReleases({ headers })
|
unbuiltReleases = await getUnBuiltReleases({ headers })
|
||||||
if (!unbuiltReleases.some(x => targetsEqual(x, target!))) {
|
if (!unbuiltReleases.some(x => targetsEqual(x, target!))) {
|
||||||
console.log(`${target} already uploaded.`)
|
console.log(`${target} already uploaded.`)
|
||||||
|
process.exit(0)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
await got(gitRelease.upload_url.split('{')[0], {
|
await got(gitRelease.upload_url.split('{')[0], {
|
||||||
|
|||||||
Reference in New Issue
Block a user