Merge pull request #36 from atom-ide-community/vsts-config-atom-ide-community-org

Author: aminya

script/vsts/get-release-version.js

@@ -4,6 +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 yargs = require('yargs');
 const argv = yargs
   .usage('Usage: $0 [options]')
@@ -26,7 +29,7 @@ async function getReleaseVersion() {
   let releaseVersion = process.env.ATOM_RELEASE_VERSION || appMetadata.version;
   if (argv.nightly) {
     const releases = await request({
-      url: 'https://api.github.com/repos/atom/atom-nightly-releases/releases',
+      url: `https://api.github.com/repos/${REPO_OWNER}/${NIGHTLY_RELEASE_REPO}/releases`,
       headers: {
         Accept: 'application/vnd.github.v3+json',
         'User-Agent': 'Atom Release Build'

script/vsts/lib/release-notes.js

@@ -3,6 +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;
+
 module.exports.getRelease = async function(releaseVersion, githubToken) {
   if (githubToken) {
     octokit.authenticate({
@@ -12,8 +16,8 @@ module.exports.getRelease = async function(releaseVersion, githubToken) {
   }
 
   const releases = await octokit.repos.getReleases({
-    owner: 'atom',
-    repo: 'atom'
+    owner: REPO_OWNER,
+    repo: MAIN_REPO
   });
   const release = releases.data.find(r => semver.eq(r.name, releaseVersion));
 
@@ -49,16 +53,16 @@ module.exports.generateForVersion = async function(
     oldVersionName = `v${parsedVersion.major}.${parsedVersion.minor - 1}.0`;
   } else {
     let releases = await octokit.repos.getReleases({
-      owner: 'atom',
-      repo: 'atom'
+      owner: REPO_OWNER,
+      repo: MAIN_REPO
     });
     oldVersion = 'v' + getPreviousRelease(releaseVersion, releases.data).name;
     oldVersionName = oldVersion;
   }
 
   const allChangesText = await changelog.getChangelog({
-    owner: 'atom',
-    repo: 'atom',
+    owner: REPO_OWNER,
+    repo: MAIN_REPO,
     fromTag: oldVersion,
     toTag: newVersionBranch,
     dependencyKey: 'packageDependencies',
@@ -71,7 +75,7 @@ module.exports.generateForVersion = async function(
     }) {
       let prString = changelog.pullRequestsToString(pullRequests);
       let title = repo;
-      if (repo === 'atom') {
+      if (repo === MAIN_REPO) {
         title = 'Atom Core';
         fromTag = oldVersionName;
         toTag = releaseVersion;
@@ -110,13 +114,13 @@ module.exports.generateForNightly = async function(
 
   const latestCommit = latestCommitResult.stdout.toString().trim();
   const output = [
-    `### This nightly release is based on https://github.com/atom/atom/commit/${latestCommit} :atom: :night_with_stars:`
+    `### This nightly release is based on https://github.com/${REPO_OWNER}/${MAIN_REPO}/commit/${latestCommit} :atom: :night_with_stars:`
   ];
 
   try {
     const releases = await octokit.repos.getReleases({
-      owner: 'atom',
-      repo: 'atom-nightly-releases'
+      owner: REPO_OWNER,
+      repo: NIGHTLY_RELEASE_REPO
     });
 
     const previousRelease = getPreviousRelease(releaseVersion, releases.data);
@@ -139,7 +143,7 @@ module.exports.generateForNightly = async function(
           output.push('No changes have been included in this release');
         } else {
           output.push(
-            `Click [here](https://github.com/atom/atom/compare/${previousCommit}...${latestCommit}) to see the changes included with this release!`
+            `Click [here](https://github.com/${REPO_OWNER}/${MAIN_REPO}/compare/${previousCommit}...${latestCommit}) to see the changes included with this release!`
           );
         }
       }

script/vsts/nightly-release.yml

@@ -11,6 +11,9 @@ jobs:
         displayName: npm install
       - script: node script\vsts\get-release-version.js --nightly
         name: Version
+        env:
+          REPO_OWNER: $(REPO_OWNER)
+          NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO)
 
   # Import OS-specific build definitions
   - template: platforms/windows.yml
@@ -59,6 +62,9 @@ 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

script/vsts/pull-requests.yml

@@ -13,6 +13,9 @@ jobs:
         displayName: npm install
       - script: node script\vsts\get-release-version.js
         name: Version
+        env:
+          REPO_OWNER: $(REPO_OWNER)
+          NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO)
 
   # Import OS-specific build definitions
   - template: platforms/windows.yml

script/vsts/release-branch-build.yml

@@ -17,6 +17,9 @@ jobs:
         displayName: npm install
       - script: node script\vsts\get-release-version.js
         name: Version
+        env:
+          REPO_OWNER: $(REPO_OWNER)
+          NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO)
 
   # Import OS-specific build definitions.
   - template: platforms/windows.yml
@@ -68,6 +71,9 @@ 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'))
 
@@ -78,5 +84,8 @@ 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'))

script/vsts/upload-artifacts.js

@@ -12,6 +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 yargs = require('yargs');
 const argv = yargs
   .usage('Usage: $0 [options]')
@@ -127,13 +131,13 @@ async function uploadArtifacts() {
       ? spawnSync('git', ['rev-parse', 'HEAD'])
           .stdout.toString()
           .trimEnd()
-      : 'master'; // Nightly tags are created in atom/atom-nightly-releases so the SHA is irrelevant
+      : 'master'; // Nightly tags are created in REPO_OWNER/NIGHTLY_RELEASE_REPO so the SHA is irrelevant
 
     console.log(`Creating GitHub release v${releaseVersion}`);
     const release = await publishReleaseAsync({
       token: process.env.GITHUB_TOKEN,
-      owner: 'atom',
-      repo: !isNightlyRelease ? 'atom' : 'atom-nightly-releases',
+      owner: REPO_OWNER,
+      repo: !isNightlyRelease ? MAIN_REPO : NIGHTLY_RELEASE_REPO,
       name: CONFIG.computedAppVersion,
       notes: newReleaseNotes,
       target_commitish: releaseSha,