diff --git a/buildspec-pr.yaml b/buildspec-pr.yaml
new file mode 100644
index 0000000000000..909ff549172c7
--- /dev/null
+++ b/buildspec-pr.yaml
@@ -0,0 +1,11 @@
+version: 0.2
+
+# This buildspec is intended to be used by GitHub PR builds.
+
+phases:
+  install:
+    commands:
+      - /bin/bash ./install.sh
+  build:
+    commands:
+      - /bin/bash ./build.sh
diff --git a/buildspec.yaml b/buildspec.yaml
index 97f31c3c91e31..ef888c6eb56b8 100644
--- a/buildspec.yaml
+++ b/buildspec.yaml
@@ -1,5 +1,7 @@
 version: 0.2
 
+# This buildspec is intended to be run by CodePipeline builds.
+
 phases:
   install:
     commands:
@@ -12,12 +14,7 @@ phases:
       - /bin/bash ./build.sh
   post_build:
     commands:
-      - |
-        if [ -f .BUILD_COMPLETED ]; then
-          if [ -z \"${SKIP_PACK:-}\" ]; then
-            /bin/bash ./pack.sh
-          fi
-        fi
+      - "[ -f .BUILD_COMPLETED ] && /bin/bash ./pack.sh"
 artifacts:
   files:
     - "**/*"