ci: fix snapshots

hansl · hansl · commit 96ba8f257a40 · 2018-06-05T17:55:15.000-07:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,10 +14,6 @@ jobs:
     steps:
       - checkout:
           <<: *post_checkout
-      # Check BUILD.bazel formatting before we have a node_modules directory
-      # Then we don't need any exclude pattern to avoid checking those files
-      - run: 'buildifier -mode=check $(find . -type f \( -name BUILD.bazel -or -name BUILD \)) ||
-              (echo "BUILD files not formatted. Please run ''npm run buildifier''" ; exit 1)'
       - restore_cache:
           key: angular_devkit-{{ checksum "package-lock.json" }}
 
@@ -93,14 +89,15 @@ jobs:
       - restore_cache:
           key: angular_devkit-{{ checksum "package-lock.json" }}
 
+      - run: npm install --no-save
       - run:
           name: Decrypt Credentials
           command: |
             openssl aes-256-cbc -d -in .circleci/github_token -k "${KEY}" -out ~/github_token
       - run:
           name: Deployment to Snapshot
           command: |
-            npm run admin -- snapshots --verbose --githubToken="$(cat ~/github_token)"
+            npm run admin -- snapshots --verbose --githubTokenFile=~/github_token
 
 workflows:
   version: 2
diff --git a/.circleci/github_token b/.circleci/github_token
@@ -1,2 +1,3 @@
-Salted__3�H��-V@�:}�<ˀy��
-_K���7KIKʹ,w����f�Ao*y�fX��
+Salted__fE~W_�ZA<J�E��D(�E�C��Ms�
+v�
+���0�Y�=@�J`P*Z�XH�(`
diff --git a/scripts/snapshots.ts b/scripts/snapshots.ts
@@ -31,7 +31,12 @@ function _copy(from: string, to: string) {
 }
 
 
-export default function(opts: { force?: boolean, githubToken: string }, logger: logging.Logger) {
+export interface SnapshotsOptions {
+  force?: boolean;
+  githubTokenFile: string;
+}
+
+export default function(opts: SnapshotsOptions, logger: logging.Logger) {
   // Get the SHA.
   if (execSync(`git status --porcelain`).toString() && !opts.force) {
     logger.error('You cannot run snapshots with local changes.');
@@ -41,6 +46,8 @@ export default function(opts: { force?: boolean, githubToken: string }, logger:
   const root = fs.mkdtempSync(path.join(os.tmpdir(), 'angular-devkit-publish-'));
   const message = execSync(`git log --format="%h %s" -n1`).toString().trim();
 
+  const githubToken = fs.readFileSync(opts.githubTokenFile, 'utf-8');
+
   // Run build.
   logger.info('Building...');
   build({ snapshot: true }, logger.createChild('build'));
@@ -65,8 +72,7 @@ export default function(opts: { force?: boolean, githubToken: string }, logger:
     _copy(pkg.dist, destPath);
 
     execSync(`git config credential.helper "store --file=.git/credentials"`, { cwd: destPath });
-    fs.writeFileSync(path.join(destPath, '.git/credentials'),
-      `https://${opts.githubToken}@github.com`);
+    fs.writeFileSync(path.join(destPath, '.git/credentials'), `https://${githubToken}@github.com`);
 
     // Make sure that every snapshots is unique.
     fs.writeFileSync(path.join(destPath, 'uniqueId'), '' + new Date());

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`		`-Salted__3�H��-V@�:}�<ˀy��`
`2`		`-_K��7KIKʹ,w��f�Ao*y�fX��`
	`1`	`+Salted__fE~W_�ZA<J�E��D(�E�C��Ms�`
	`2`	`+v�`
	`3`	+��0�Y�=@�J`P*Z�XH�(`