mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2024-09-20 07:28:08 +03:00
Merge remote-tracking branch 'atom-ide-community/master' into CI-GetReleaseVersion-template
This commit is contained in:
commit
ef38967ee7
@ -4,8 +4,9 @@ const request = require('request-promise-native');
|
||||
const repositoryRootPath = path.resolve(__dirname, '..', '..');
|
||||
const appMetadata = require(path.join(repositoryRootPath, 'package.json'));
|
||||
|
||||
const REPO_OWNER = process.env.REPO_OWNER;
|
||||
const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO;
|
||||
const REPO_OWNER = process.env.REPO_OWNER || 'atom';
|
||||
const NIGHTLY_RELEASE_REPO =
|
||||
process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases';
|
||||
|
||||
const yargs = require('yargs');
|
||||
const argv = yargs
|
||||
|
@ -3,9 +3,10 @@ const octokit = require('@octokit/rest')();
|
||||
const changelog = require('pr-changelog');
|
||||
const childProcess = require('child_process');
|
||||
|
||||
const REPO_OWNER = process.env.REPO_OWNER;
|
||||
const MAIN_REPO = process.env.MAIN_REPO;
|
||||
const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO;
|
||||
const REPO_OWNER = process.env.REPO_OWNER || 'atom';
|
||||
const MAIN_REPO = process.env.MAIN_REPO || 'atom';
|
||||
const NIGHTLY_RELEASE_REPO =
|
||||
process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases';
|
||||
|
||||
module.exports.getRelease = async function(releaseVersion, githubToken) {
|
||||
if (githubToken) {
|
||||
|
@ -16,7 +16,7 @@ jobs:
|
||||
|
||||
dependsOn:
|
||||
- GetReleaseVersion
|
||||
- Windows
|
||||
- Windows_RendererTests
|
||||
- Linux
|
||||
- macOS_tests
|
||||
|
||||
@ -26,8 +26,6 @@ jobs:
|
||||
steps:
|
||||
- template: platforms/templates/preparation.yml
|
||||
|
||||
#This has to be done separately because VSTS inexplicably
|
||||
#exits the script block after `npm ci` completes.
|
||||
- script: |
|
||||
cd script/vsts
|
||||
npm ci
|
||||
@ -48,9 +46,6 @@ jobs:
|
||||
ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
|
||||
ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
|
||||
PACKAGE_CLOUD_API_KEY: $(PACKAGE_CLOUD_API_KEY)
|
||||
REPO_OWNER: $(REPO_OWNER)
|
||||
MAIN_REPO: $(MAIN_REPO)
|
||||
NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO)
|
||||
displayName: Create Nightly Release
|
||||
- job: bump_dependencies
|
||||
displayName: Bump Dependencies
|
||||
|
@ -5,7 +5,6 @@ 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
|
||||
|
||||
steps:
|
||||
|
@ -12,14 +12,8 @@ jobs:
|
||||
pool:
|
||||
vmImage: 'ubuntu-latest'
|
||||
steps:
|
||||
# This has to be done separately because VSTS inexplicably
|
||||
# exits the script block after `npm ci` completes.
|
||||
- script: |
|
||||
cd script/vsts
|
||||
npm ci
|
||||
displayName: npm ci
|
||||
- script: node script/vsts/get-release-version.js ${{ parameters.NightlyFlag }}
|
||||
node get-release-version.js ${{ parameters.NightlyFlag }}
|
||||
name: Version
|
||||
env:
|
||||
REPO_OWNER: $(REPO_OWNER)
|
||||
NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO)
|
||||
|
@ -1,5 +1,6 @@
|
||||
jobs:
|
||||
- job: Windows
|
||||
- job: Windows_build
|
||||
displayName: Windows build
|
||||
dependsOn: GetReleaseVersion
|
||||
timeoutInMinutes: 180
|
||||
strategy:
|
||||
@ -71,7 +72,8 @@ jobs:
|
||||
condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))
|
||||
|
||||
- job: Windows_RendererTests
|
||||
dependsOn: Windows
|
||||
displayName: Windows
|
||||
dependsOn: Windows_build
|
||||
timeoutInMinutes: 180
|
||||
strategy:
|
||||
maxParallel: 2
|
||||
|
@ -19,7 +19,7 @@ jobs:
|
||||
|
||||
dependsOn:
|
||||
- GetReleaseVersion
|
||||
- Windows
|
||||
- Windows_RendererTests
|
||||
- Linux
|
||||
- macOS_tests
|
||||
|
||||
@ -29,8 +29,6 @@ jobs:
|
||||
IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
|
||||
|
||||
steps:
|
||||
# This has to be done separately because VSTS inexplicably
|
||||
# exits the script block after `npm ci` completes.
|
||||
- script: |
|
||||
cd script/vsts
|
||||
npm ci
|
||||
@ -53,9 +51,6 @@ jobs:
|
||||
ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
|
||||
ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
|
||||
PACKAGE_CLOUD_API_KEY: $(PACKAGE_CLOUD_API_KEY)
|
||||
REPO_OWNER: $(REPO_OWNER)
|
||||
MAIN_REPO: $(MAIN_REPO)
|
||||
NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO)
|
||||
displayName: Create Draft Release
|
||||
condition: and(succeeded(), eq(variables['Atom.AutoDraftRelease'], 'true'), eq(variables['IsReleaseBranch'], 'true'))
|
||||
|
||||
@ -66,8 +61,5 @@ jobs:
|
||||
ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY)
|
||||
ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
|
||||
ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
|
||||
REPO_OWNER: $(REPO_OWNER)
|
||||
MAIN_REPO: $(MAIN_REPO)
|
||||
NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO)
|
||||
displayName: Upload CI Artifacts to S3
|
||||
condition: and(succeeded(), eq(variables['IsSignedZipBranch'], 'true'))
|
||||
|
@ -12,9 +12,10 @@ const uploadLinuxPackages = require('./lib/upload-linux-packages');
|
||||
|
||||
const CONFIG = require('../config');
|
||||
|
||||
const REPO_OWNER = process.env.REPO_OWNER;
|
||||
const MAIN_REPO = process.env.MAIN_REPO;
|
||||
const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO;
|
||||
const REPO_OWNER = process.env.REPO_OWNER || 'atom';
|
||||
const MAIN_REPO = process.env.MAIN_REPO || 'atom';
|
||||
const NIGHTLY_RELEASE_REPO =
|
||||
process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases';
|
||||
|
||||
const yargs = require('yargs');
|
||||
const argv = yargs
|
||||
|
@ -49,7 +49,9 @@ module.exports = class AtomWindow extends EventEmitter {
|
||||
// (Ref: https://github.com/atom/atom/pull/12696#issuecomment-290496960)
|
||||
disableBlinkFeatures: 'Auxclick',
|
||||
nodeIntegration: true,
|
||||
webviewTag: true
|
||||
webviewTag: true,
|
||||
// multi-threading
|
||||
nodeIntegrationInWorker: true
|
||||
}
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user