Blah?

camckk · Sep 23, 2021 · 9d417cb · 9d417cb
2 parents 75b9f3d + 934194f
commit 9d417cb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 sudo: require
 services:
 - docker
@@ -14,3 +15,19 @@ deploy:
     secure: invKD1raBkxaTEi7blx/RIJL9zoTkprXc0b3sEh8Q0MJDX2Whmkq5bwSdjTKQe3pjsRRuehPd37de7gGYJJnSdnc7UrQaNdJi50HFCD/Tg7XcLVuLgVTis/mn4sMv+b3wAiW32j840I4OFOt5MsTV0UdCiUkMsCcc67XIYxc3yIvfWVoJSpLBUsCfC7Xh11is9MZgFS5InDzpWuiHb7ogfiRCodbpevR5xYAd+rRzBJAzI88anZXldA5mabuyx+GqwHEEO85Etr4LQWAGxlW8w+B55KZdgHxewp1mANPBS4Jglrn+H34uZhmDL9Ng/yMBCPtqp89CwPAKANVB5IaAqzUNWuHkrSxem1FEdvlWCHjaxPCnljsyAMTXD9RfG9UF35hyJyB+M6uoXaIXTPHUzjPh2I1L3+hVTXT/J0uyAo5hG9xabn9Tm2ZYK9CijGQj1G2zqhVRM1YoJfQP4P1JOiiTOnZ0tXlAw8hQHXldmiixcKIHIn9xZsRFAWniWRQ6uRD4i6f6RuGCcUv0HnT1kh4EYW1tSqxdTcoJ43Zr4xyDT9CyZww24Q8CE7nsiGHHiEqFNV9ckLLJjxyCXX2p/I6OvhQqmlu7OYnfz4gGTirAoAM+9T8vY/+kYovWgDPWCLr5tsSnFFRPEnTPXUryWHX034b8W9PXMH7yz2jw1s=
 on: heroku_production
 app: probot-camckk
+=======
+sudo: required
+services:
+    - docker
+
+before_install:
+    - docker pull node:8-onbuild
+
+install:
+    - docker build -t probot-hello .
+
+script:
+    - docker run --rm probot-hello npm run test
+    - docker run --rm probot-hello npm run lint
+
+>>>>>>> 934194f3ab7c6df2146b52c33b36b457e4880092
diff --git a/Dockerfile b/Dockerfile
@@ -7,8 +7,12 @@ ENV LOG_LEVEL=error
 ENV APP_ID=1234
 ENV WEBHOOK_SECRET=development
 ENV WEBHOOK_PROXY_URL=https://localhost:3000/
+<<<<<<< HEAD
 #ENV PRIVATE_KEY="-----BEGIN RSA PRIVATE KEY-----c29tZXByaXZhdGVzdHJpbmcK-----END RSA PRIVATE KEY-----"
 # ENV PRIVATE_KEY="someprivatestring"
+=======
+ENV PRIVATE_KEY="someprivatestring"
+>>>>>>> 934194f3ab7c6df2146b52c33b36b457e4880092
 
 # see https://github.com/nodejs/docker-node/blob/e3ec2111af089e31321e76641697e154b3b6a6c3/docs/BestPractices.md#global-npm-dependencies
 ENV NPM_CONFIG_PREFIX=/home/node/.npm-global