Merge pull request wemake-services#8 from sproogen/merge-conflict-a90e87

Automatic merge failure

Author: sproogen

Diff for: .travis.yml

@@ -18,8 +18,8 @@ branches:
     - master
     - develop
 
-# before_install:
-#   - ./scripts/bump-version.sh
+before_install:
+  - ./scripts/bump-version.sh
 
 script:
   - bundle exec jekyll build --config _test/_config.yml
@@ -28,9 +28,9 @@ script:
 after_success:
   - ./scripts/merge-downstream.sh
 
-# deploy:
-#   provider: rubygems
-#   on:
-#     branch: master
-#   api_key:
-#     secure: "RNKG1VHenOH/xa5Qax6nK8rEP4iS9rQ28jXOb0q3sgWbcgRoBm2B9lUl1WZ6gPcOIIlN+79FFXEzWJMM1NPxs9N5ZLHVQV35D8ApA2lFOU8C4jzgQstAIXh0Pa8HBHTnYbjHObobiuKmI4oqOQ/WV8I6281Ol+PcQizstLwiHI+soqRea94vuuOCqalaQL9zOXZHaqYyQYJSJOFWAyPO3+wjJU8lpN9Dt3n2J+XZujbdIG99otQAE+/dr+cy0ax4a8K0voEOQ9rVdSUjXMspsog7kT+qcVUehmcTfVRyWZcUPTgVgJ3vneWTtdRTVAK75TuENlPFJ0SsIYuHmIHigQpvdWBGFF43h+Ipm37Y+jRTdwxhhShmrfQ4Ljvnp/AahxHmMUSF12c0Ft0wPCsMqWbQJs9MZneTB5NXq+OvJDI2Ve8fYvrINgPdFv+tn8gE8tR8BU3nZB+gsFLzdOiJPfwCxf9xSTexWYCTSqFoo9LgML00g0BykQE9Nm4mY0/y4VqUjMCAoHnlh7hK7N2wFNBiGEcGtwmRVacCBWz42W5lX6T8KuM5nT10hOwXF+uVSUsSw7JglHOWYharegjnhnjS9fbbQCUXSuDuUunZWagTYKj4QM94BmMoEAT+RZ1LsKWR6SojjMB8Cms2J70TcqZBsO5CBGug1VWk6NzdNJI="
+deploy:
+  provider: rubygems
+  on:
+    branch: master
+  api_key:
+    secure: "RNKG1VHenOH/xa5Qax6nK8rEP4iS9rQ28jXOb0q3sgWbcgRoBm2B9lUl1WZ6gPcOIIlN+79FFXEzWJMM1NPxs9N5ZLHVQV35D8ApA2lFOU8C4jzgQstAIXh0Pa8HBHTnYbjHObobiuKmI4oqOQ/WV8I6281Ol+PcQizstLwiHI+soqRea94vuuOCqalaQL9zOXZHaqYyQYJSJOFWAyPO3+wjJU8lpN9Dt3n2J+XZujbdIG99otQAE+/dr+cy0ax4a8K0voEOQ9rVdSUjXMspsog7kT+qcVUehmcTfVRyWZcUPTgVgJ3vneWTtdRTVAK75TuENlPFJ0SsIYuHmIHigQpvdWBGFF43h+Ipm37Y+jRTdwxhhShmrfQ4Ljvnp/AahxHmMUSF12c0Ft0wPCsMqWbQJs9MZneTB5NXq+OvJDI2Ve8fYvrINgPdFv+tn8gE8tR8BU3nZB+gsFLzdOiJPfwCxf9xSTexWYCTSqFoo9LgML00g0BykQE9Nm4mY0/y4VqUjMCAoHnlh7hK7N2wFNBiGEcGtwmRVacCBWz42W5lX6T8KuM5nT10hOwXF+uVSUsSw7JglHOWYharegjnhnjS9fbbQCUXSuDuUunZWagTYKj4QM94BmMoEAT+RZ1LsKWR6SojjMB8Cms2J70TcqZBsO5CBGug1VWk6NzdNJI="

Diff for: lib/resume-theme/version.rb

@@ -1,3 +1,3 @@
 module ResumeTheme
-  VERSION = "0.1.19"
+  VERSION = "0.1.20"
 end

Diff for: scripts/merge-downstream.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -v
+# set -v
 
 if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
     git remote set-branches --add origin develop;
@@ -13,13 +13,17 @@ if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; th
     if [[ ("$?" -ne "0") ]]; then
         git merge --abort;
         git reset --hard;
+        git checkout master;
 
-        echo "Just for lols"
+        CONFLICT_BRANCH_NAME=merge-conflict-$(date | md5sum | head -c 6);
 
-        curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST -d '{"title":"Automatic merge failure", "base":"develop", "head":"master"}' "https://api.github.com/repos/${TRAVIS_REPO_SLUG}/pulls";
+        git checkout -b $CONFLICT_BRANCH_NAME;
+        git push "https://${GITHUB_TOKEN}@${GITHUB_REPO}" $CONFLICT_BRANCH_NAME;
+
+        curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST -d '{"title":"Automatic merge failure", "base":"develop", "head":"'$CONFLICT_BRANCH_NAME'"}' "https://api.github.com/repos/${TRAVIS_REPO_SLUG}/pulls";
     else
         git push "https://${GITHUB_TOKEN}@${GITHUB_REPO}" develop;
-    fi
 
-    git checkout master;
+        git checkout master;
+    fi
 fi