try switch build -> dist

ampproject · Feb 10, 2020 · 3cdf5b7 · 3cdf5b7
1 parent fab02dd
commit 3cdf5b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/build-system/pr-check/local-tests.js b/build-system/pr-check/local-tests.js
@@ -23,7 +23,7 @@
 
 const colors = require('ansi-colors');
 const {
-  downloadBuildOutput,
+  downloadDistOutput,
   printChangeSummary,
   startTimer,
   stopTimer,
@@ -41,7 +41,7 @@ function main() {
   const startTime = startTimer(FILENAME, FILENAME);
 
   if (!isTravisPullRequestBuild()) {
-    downloadBuildOutput(FILENAME);
+    downloadDistOutput(FILENAME);
     timedExecOrDie('gulp update-packages');
     timedExecOrDie('gulp integration --nobuild --headless --coverage');
     timedExecOrDie('gulp unit --nobuild --headless --coverage');
@@ -65,7 +65,7 @@ function main() {
       return;
     }
 
-    downloadBuildOutput(FILENAME);
+    downloadDistOutput(FILENAME);
     timedExecOrDie('gulp update-packages');
 
     if (buildTargets.has('RUNTIME') || buildTargets.has('UNIT_TEST')) {

diff --git a/test/unit/test-ampdoc.js b/test/unit/test-ampdoc.js
@@ -302,7 +302,6 @@ describes.sandboxed('AmpDocService', {}, () => {
 
       const content2 = document.createElement('span');
       const host2 = document.createElement('div');
-<<<<<<< HEAD
 
       let shadowRoot2;
       if (isShadowDomSupported()) {
@@ -313,9 +312,6 @@ describes.sandboxed('AmpDocService', {}, () => {
         }
       }
 
-=======
-      const shadowRoot2 = host2.attachShadow({mode: 'open'});
->>>>>>> 680f5b86c... Fix issue with deprecated API in test
       shadowRoot2.appendChild(content2);
       shadowRoot.appendChild(host2);
       expect(content2.parentNode).to.equal(shadowRoot2);
@@ -434,7 +430,6 @@ describes.sandboxed('AmpDocService', {}, () => {
 
       const content2 = document.createElement('span');
       const host2 = document.createElement('div');
-<<<<<<< HEAD
 
       let shadowRoot2;
       if (isShadowDomSupported()) {
@@ -445,9 +440,6 @@ describes.sandboxed('AmpDocService', {}, () => {
         }
       }
 
-=======
-      const shadowRoot2 = host2.attachShadow({mode: 'open'});
->>>>>>> 680f5b86c... Fix issue with deprecated API in test
       shadowRoot2.appendChild(content2);
       shadowRoot.appendChild(host2);
       expect(content2.parentNode).to.equal(shadowRoot2);