Fix warnings in build.

Author: shivammathur

.gitattributes

@@ -0,0 +1 @@
+*.rb merge=union

.github/scripts/build.sh

@@ -84,19 +84,27 @@ if [[ "$GITHUB_MESSAGE" = *--build-all* ]] || [ "$latest_version" != "$existing_
     git config --local user.email [email protected]
     git config --local user.name BrewTestBot
     for try in $(seq 10); do
-      echo "try: $try" >/dev/null
+      echo "try: $try"
+      git rebase --abort || true
       git fetch origin master && git rebase origin/master
-      if git push https://"$GITHUB_REPOSITORY_OWNER":"$GITHUB_TOKEN"@github.com/"$GITHUB_REPOSITORY".git HEAD:master --follow-tags; then
+      if [ "$(git ls-files -u | wc -l)" -gt 0 ] ; then
+        sed -i '' '/=====|>>>>>|<<<<</d' Formula/"$PHP_VERSION".rb
+        git add Formula/"$PHP_VERSION".rb && git rebase --continue
+      fi
+      if git push https://"$GITHUB_REPOSITORY_OWNER":"$GITHUB_TOKEN"@github.com/"$GITHUB_REPOSITORY".git master; then
         break
       else
         sleep 3s
       fi
     done
     add_log "$tick" "Inventory" "updated"
+    echo "::set-output name=build::true"
   else
+    echo "::set-output name=build::false"
     add_log "$cross" "bottle" "broke"
     exit 1
   fi    
 else
+  echo "::set-output name=build::false"
   add_log "$tick" "PHP $new_version" "Bottle exists"
 fi

.github/workflows/update.yml

@@ -29,6 +29,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: build
+      id: build
       run: sh ./.github/scripts/build.sh
       env:        
         GITHUB_ACTIONS: true        
@@ -48,6 +49,7 @@ jobs:
         DARWIN_VERSION: ${{ matrix.os-version }}
       continue-on-error: true
     - name: Upload Artifact
+      if: steps.build.outputs.build == 'true'
       uses: actions/upload-artifact@v2
       with:
         name: ${{ matrix.php-version }}

Formula/[email protected]

@@ -6,9 +6,9 @@ class PhpAT80 < Formula
 
   bottle do
     root_url "https://dl.bintray.com/shivammathur/php"
-    rebuild 347
-    sha256 "6208785804c9d044f171bfe5a99f70a5f792aab452778607ad509157842fb563" => :big_sur
-    sha256 "341edde90d0bf28177930556dc83406de93294477d221a5a33ef2945d9ed40ce" => :catalina
+    rebuild 349
+    sha256 "a64ac2b92db1a1c3d0565142426c9e11c2a5c50699a76d80ebfa9b74485fffaa" => :big_sur
+    sha256 "02f7a6b22272c90096b269c447dd477ac7c36634d81e8a2af37653177335d5ec" => :catalina
   end
 
   keg_only :versioned_formula

Formula/[email protected]

@@ -6,9 +6,9 @@ class PhpAT81 < Formula
 
   bottle do
     root_url "https://dl.bintray.com/shivammathur/php"
-    rebuild 11
-    sha256 "1936b417e34fdf5a3e9a4dc5d09942ab385072af5f7b03f58caf67b502833943" => :big_sur
-    sha256 "cf3ae69bd933320693ea61121ca794715a82e5bdbb6858148c2c501261eef8fb" => :catalina
+    rebuild 13
+    sha256 "36c2e9e779e842d4be9359eff320db19dd1f21a03cfb366618cbc88f22b97f1d" => :big_sur
+    sha256 "6e4401448dbb455fed3c4ef437046dbe4bfc62ba9ddb4b6fde8d25242af9340c" => :catalina
   end
 
   keg_only :versioned_formula