github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-26 07:19:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:atom/atom into tt-18-sept-tooltip-bug

Browse Source
This commit is contained in:
Tilde Ann Thurium
2018-09-14 15:24:12 -07:00
parent 945b57e2ca bc9d9bc495
commit 6bb1318a05
10 changed files with 1031 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
package-lock.json generated
View File

@@ -2020,9 +2020,9 @@
"integrity": "sha1-wkvJvTphSPYiBM6GQ9Lombnsud4="
},
"event-kit": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/event-kit/-/event-kit-2.5.0.tgz",
"integrity": "sha1-L3KxHitfUzzByVA4cEBiSkoCX+g="
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/event-kit/-/event-kit-2.5.1.tgz",
"integrity": "sha512-frzENdbgPE8VQwBhMXWC8U7/qs80HpENLp4/QA8dhltAhQUuBJVgRn9HOjTF9BVpqqTvx3pScK9rm3oRBooTFA=="
},
"event-stream": {
"version": "3.1.7",
@@ -2509,6 +2509,11 @@
"yubikiri": "1.0.0"
},
"dependencies": {
"event-kit": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/event-kit/-/event-kit-2.5.0.tgz",
"integrity": "sha512-tUDxeNC9JzN2Tw/f8mLtksY34v1hHmaR7lV7X4p04XSjaeUhFMfzjF6Nwov9e0EKGEx63BaKcgXKxjpQaPo0wg=="
},
"fs-extra": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
@@ -3230,10 +3235,10 @@
}
},
"language-ruby": {
"version": "https://www.atom.io/api/packages/language-ruby/versions/0.72.8/tarball",
"integrity": "sha512-KBDThKNXbf766mJc9Gpq81IYqK4V3EEz6q2GO6TkwNwD/gICHXQ0qo3t5AzM8Fs17VdH97LhoSSOxX2cGGKhVQ==",
"version": "https://www.atom.io/api/packages/language-ruby/versions/0.72.9/tarball",
"integrity": "sha512-qyQZiiOsjDztsIE20VM0iPn5hQ1rdAtTVXV5R+JOOH1LCVCMx2N0t0xmXHI+q6++dGxyr+10sSwY4wqc7YbmXg==",
"requires": {
"tree-sitter-ruby": "^0.13.9"
"tree-sitter-ruby": "^0.13.10"
}
},
"language-ruby-on-rails": {
@@ -5497,9 +5502,9 @@
"integrity": "sha1-WEZ4Yje0I5AU8F2xVrZDIS1MbzY="
},
"tree-sitter": {
"version": "0.13.11",
"resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.13.11.tgz",
"integrity": "sha512-KqQHKqeqZo7Y10tmTdVIq7+xD8DtlMwXlYNL8hgpbNNDNQMBpNTYu/s4io+ul863uA8bUXy0h7M85RHKz/LLLw==",
"version": "0.13.13",
"resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.13.13.tgz",
"integrity": "sha512-QdzYSGb6ede63AK5mC8poZ1el+y+MWsgR6qfvL7TcJp5vkekSn5DrX9fJmF8GfjZptNdnxH6GSPVGDLf0wwrfg==",
"requires": {
"nan": "^2.10.0",
"prebuild-install": "^5.0.0"
@@ -5637,9 +5642,9 @@
}
},
"tree-sitter-ruby": {
"version": "0.13.9",
"resolved": "https://registry.npmjs.org/tree-sitter-ruby/-/tree-sitter-ruby-0.13.9.tgz",
"integrity": "sha512-LdIWR1gtcFpzPerbzxFwsAWpEUFjnQq8ZH/ery2sL4GWkeCDFCoz3IMKEFWfyA01oeMb9RZEMwQ8lwocGHvCpg==",
"version": "0.13.10",
"resolved": "https://registry.npmjs.org/tree-sitter-ruby/-/tree-sitter-ruby-0.13.10.tgz",
"integrity": "sha512-IbDvrFc4MazC4IvlwCYRfGqy0YL9aSz0M3BmVe+PSOS+SZUvAiphunHiHw81sU+KxXNWelyCvNch3mC80MSqbg==",
"requires": {
"nan": "^2.10.0",
"prebuild-install": "^5.0.0"

8
package.json
View File

@@ -54,7 +54,7 @@
"devtron": "1.3.0",
"encoding-selector": "https://www.atom.io/api/packages/encoding-selector/versions/0.23.9/tarball",
"etch": "^0.12.6",
"event-kit": "^2.5.0",
"event-kit": "^2.5.1",
"exception-reporting": "https://www.atom.io/api/packages/exception-reporting/versions/0.43.1/tarball",
"find-and-replace": "https://www.atom.io/api/packages/find-and-replace/versions/0.215.14/tarball",
"find-parent-dir": "^0.3.0",
@@ -100,7 +100,7 @@
"language-php": "https://www.atom.io/api/packages/language-php/versions/0.44.0/tarball",
"language-property-list": "https://www.atom.io/api/packages/language-property-list/versions/0.9.1/tarball",
"language-python": "https://www.atom.io/api/packages/language-python/versions/0.51.5/tarball",
"language-ruby": "https://www.atom.io/api/packages/language-ruby/versions/0.72.8/tarball",
"language-ruby": "https://www.atom.io/api/packages/language-ruby/versions/0.72.9/tarball",
"language-ruby-on-rails": "https://www.atom.io/api/packages/language-ruby-on-rails/versions/0.25.3/tarball",
"language-sass": "https://www.atom.io/api/packages/language-sass/versions/0.62.0/tarball",
"language-shellscript": "https://www.atom.io/api/packages/language-shellscript/versions/0.27.5/tarball",
@@ -159,7 +159,7 @@
"temp": "^0.8.3",
"text-buffer": "13.14.8",
"timecop": "https://www.atom.io/api/packages/timecop/versions/0.36.2/tarball",
"tree-sitter": "0.13.11",
"tree-sitter": "0.13.13",
"tree-view": "https://www.atom.io/api/packages/tree-view/versions/0.224.2/tarball",
"typescript-simple": "1.0.0",
"underscore-plus": "^1.6.8",
@@ -251,7 +251,7 @@
"language-php": "0.44.0",
"language-property-list": "0.9.1",
"language-python": "0.51.5",
"language-ruby": "0.72.8",
"language-ruby": "0.72.9",
"language-ruby-on-rails": "0.25.3",
"language-sass": "0.62.0",
"language-shellscript": "0.27.5",

7
script/vsts/nightly-release.yml
View File

@@ -1,3 +1,8 @@
resources:
containers:
- container: atom-linux-ci
image: daviwil/atom-linux-ci:latest
jobs:
- job: GetReleaseVersion
@@ -17,7 +22,7 @@ jobs:
- template: platforms/linux.yml
- job: Release
pool:
pool:
vmImage: vs2015-win2012r2 # needed for Python 2.7 and gyp
dependsOn:

1001
script/vsts/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

1
script/vsts/package.json
View File

@@ -2,6 +2,7 @@
"name": "atom-release-scripts",
"description": "Atom release scripts",
"dependencies": {
"download": "^7.1.0",
"request": "^2.87.0",
"request-promise-native": "^1.0.5",
"yargs": "4.8.1"

25
script/vsts/platforms/linux.yml
View File

@@ -6,24 +6,13 @@ jobs:
variables:
ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
pool:
# This image is used to host the Docker container that runs the build
vmImage: ubuntu-16.04
container: atom-linux-ci
steps:
- task: NodeTool@0
inputs:
versionSpec: 8.9.3
displayName: Install Node.js 8.9.3
- script: npm install --global npm@6.2.0
displayName: Update npm
- script: |
sudo apt-get update
sudo apt-get install -y --no-install-recommends build-essential xvfb clang-3.5 fakeroot git libsecret-1-dev rpm libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgconf2-4 libgtk-3-0
displayName: Install apt dependencies
- script: |
script/build --create-debian-package --create-rpm-package --compress-artifacts
- script: script/build --create-debian-package --create-rpm-package --compress-artifacts
env:
ATOM_RELEASE_VERSION: $(ReleaseVersion)
displayName: Build Atom
@@ -31,11 +20,7 @@ jobs:
- script: script/lint
displayName: Run linter
- script: |
sudo /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16
export DISPLAY=':99.0'
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
script/test
- script: script/test
env:
CI: true
CI_PROVIDER: VSTS

66
script/vsts/platforms/windows.yml
View File

@@ -7,9 +7,9 @@ jobs:
matrix:
x64:
buildArch: x64
# TODO: x86 is currently not supported on VSTS
# x86:
# buildArch: x86
x86:
buildArch: x86
pool:
vmImage: vs2015-win2012r2 # needed for python 2.7 and gyp
@@ -29,23 +29,30 @@ jobs:
npm install --global --production npm-windows-upgrade
ECHO Upgrading npm
npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.2.0
displayName: Install npm 6.2.0
- script: |
cd script\vsts
npm install
displayName: Install Windows build dependencies
- script: |
IF NOT EXIST C:\tmp MKDIR C:\tmp
SET SQUIRREL_TEMP=C:\tmp
IF [%IS_RELEASE_BRANCH%]==[true] (
ECHO Creating production artifacts for release branch %BUILD_SOURCEBRANCHNAME%
script\build.cmd --code-sign --compress-artifacts --create-windows-installer
node script\vsts\windows-run.js script\build.cmd --code-sign --compress-artifacts --create-windows-installer
) ELSE (
IF [%IS_SIGNED_ZIP_BRANCH%]==[true] (
ECHO Creating signed CI artifacts for branch %BUILD_SOURCEBRANCHNAME%
script\build.cmd --code-sign --compress-artifacts
node script\vsts\windows-run.js script\build.cmd --code-sign --compress-artifacts
) ELSE (
ECHO Pull request build, no code signing will be performed
script\build.cmd --compress-artifacts
node script\vsts\windows-run.js script\build.cmd --compress-artifacts
)
)
env:
BUILD_ARCH: $(buildArch)
ATOM_RELEASE_VERSION: $(ReleaseVersion)
ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL: $(ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL)
ATOM_WIN_CODE_SIGNING_CERT_PASSWORD: $(ATOM_WIN_CODE_SIGNING_CERT_PASSWORD)
@@ -53,13 +60,16 @@ jobs:
IS_SIGNED_ZIP_BRANCH: $(IsSignedZipBranch)
displayName: Build Atom
- script: script\lint.cmd
- script: node script\vsts\windows-run.js script\lint.cmd
env:
BUILD_ARCH: $(buildArch)
displayName: Run linter
- script: script\test.cmd
- script: node script\vsts\windows-run.js script\test.cmd
env:
CI: true
CI_PROVIDER: VSTS
BUILD_ARCH: $(buildArch)
displayName: Run tests
condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true'))
@@ -69,7 +79,7 @@ jobs:
ArtifactName: atom-x64-windows.zip
ArtifactType: Container
displayName: Upload atom-x64-windows.zip
condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['buildArch'], 'x64'))
- task: PublishBuildArtifacts@1
inputs:
@@ -77,7 +87,7 @@ jobs:
ArtifactName: AtomSetup-x64.exe
ArtifactType: Container
displayName: Upload AtomSetup-x64.exe
condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))
condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x64'))
- task: PublishBuildArtifacts@1
inputs:
@@ -85,7 +95,7 @@ jobs:
ArtifactName: atom-x64-$(ReleaseVersion)-full.nupkg
ArtifactType: Container
displayName: Upload atom-x64-$(ReleaseVersion)-full.nupkg
condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))
condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x64'))
- task: PublishBuildArtifacts@1
inputs:
@@ -93,4 +103,36 @@ jobs:
ArtifactName: RELEASES-x64
ArtifactType: Container
displayName: Upload RELEASES-x64
condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))
condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x64'))
- task: PublishBuildArtifacts@1
inputs:
PathtoPublish: $(Build.SourcesDirectory)/out/atom-windows.zip
ArtifactName: atom-windows.zip
ArtifactType: Container
displayName: Upload atom-windows.zip
condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['buildArch'], 'x86'))
- task: PublishBuildArtifacts@1
inputs:
PathtoPublish: $(Build.SourcesDirectory)/out/AtomSetup.exe
ArtifactName: AtomSetup.exe
ArtifactType: Container
displayName: Upload AtomSetup.exe
condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x86'))
- task: PublishBuildArtifacts@1
inputs:
PathtoPublish: $(Build.SourcesDirectory)/out/atom-$(ReleaseVersion)-full.nupkg
ArtifactName: atom-$(ReleaseVersion)-full.nupkg
ArtifactType: Container
displayName: Upload atom-$(ReleaseVersion)-full.nupkg
condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x86'))
- task: PublishBuildArtifacts@1
inputs:
PathtoPublish: $(Build.SourcesDirectory)/out/RELEASES
ArtifactName: RELEASES
ArtifactType: Container
displayName: Upload RELEASES
condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x86'))

5
script/vsts/pull-requests.yml
View File

@@ -1,5 +1,10 @@
trigger: none # No CI builds, only PR builds
resources:
containers:
- container: atom-linux-ci
image: daviwil/atom-linux-ci:latest
jobs:
- job: GetReleaseVersion

9
script/vsts/release-branch-build.yml
View File

@@ -2,6 +2,11 @@ trigger:
- master
- 1.* # VSTS only supports wildcards at the end
resources:
containers:
- container: atom-linux-ci
image: daviwil/atom-linux-ci:latest
jobs:
- job: GetReleaseVersion
@@ -21,7 +26,7 @@ jobs:
- template: platforms/linux.yml
- job: UploadArtifacts
pool:
pool:
vmImage: vs2015-win2012r2 # needed for python 2.7 and gyp
dependsOn:
@@ -35,7 +40,7 @@ jobs:
IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
steps:
steps:
- task: NodeTool@0
inputs:
versionSpec: 8.9.3

43
script/vsts/windows-run.js Normal file
View File

@@ -0,0 +1,43 @@
// NOTE: This script is only used as part of the Windows build on VSTS,
// see script/vsts/platforms/windows.yml for its usage
const fs = require('fs')
const path = require('path')
const download = require('download')
const childProcess = require('child_process')
const nodeVersion = '8.9.3'
const nodeFileName = `node-v${nodeVersion}-win-x86`
const extractedNodePath = `c:\\tmp\\${nodeFileName}`
async function downloadX86Node () {
if (!fs.existsSync(extractedNodePath)) {
await download(`https://nodejs.org/download/release/v${nodeVersion}/${nodeFileName}.zip`, 'c:\\tmp', { extract: true })
}
}
async function runScriptForBuildArch () {
if (process.env.BUILD_ARCH === 'x86') {
await downloadX86Node()
// Write out a launcher script that will launch the requested script
// using the 32-bit cmd.exe and 32-bit Node.js
const runScript = `@echo off\r\nCALL ${extractedNodePath}\\nodevars.bat\r\nCALL ${path.resolve(process.argv[2])} ${process.argv.splice(3).join(' ')}`
const runScriptPath = 'c:\\tmp\\run.cmd'
fs.writeFileSync(runScriptPath, runScript)
childProcess.execSync(
`C:\\Windows\\SysWOW64\\cmd.exe /c "${runScriptPath}"`,
{ env: process.env, stdio: 'inherit' }
)
} else {
if (process.argv.length > 2) {
childProcess.execSync(
process.argv.splice(2).join(' '),
{ env: process.env, stdio: 'inherit' }
)
}
}
}
runScriptForBuildArch().catch(
err => console.log(`\nScript failed due to error: ${err.message}`)
)