Skip to content
Permalink
Browse files

[IT-2724] fix external pullrequests not working

  • Loading branch information...
PhilAlbrecht committed May 29, 2019
1 parent ae26b42 commit 1742af36574d01d78a88eda250f5e35e97f22409
Showing with 15 additions and 16 deletions.
  1. +10 −13 .travis.yml
  2. +5 −3 scripts/ci/building/merge_release_into_dev_and_master.sh
@@ -27,18 +27,6 @@ notifications:
addons:
chrome: stable

# set deployment key
before_install:
- >-
openssl aes-256-cbc
-K $encrypted_0e6b9eee7eaa_key
-iv $encrypted_0e6b9eee7eaa_iv
-in scripts/ci/github_deploy_key.enc
-out github_deploy_key -d
- chmod 600 github_deploy_key
- eval $(ssh-agent -s)
- ssh-add github_deploy_key

# Install ChromeDriver
install:
- wget -N https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.zip -P ~/
@@ -98,7 +86,16 @@ jobs:
git stash -u;
on:
branch: release
after_deploy:
after_deploy: # set deployment key
- >-
openssl aes-256-cbc
-K $encrypted_0e6b9eee7eaa_key
-iv $encrypted_0e6b9eee7eaa_iv
-in scripts/ci/github_deploy_key.enc
-out github_deploy_key -d
- chmod 600 github_deploy_key
- eval $(ssh-agent -s)
- ssh-add github_deploy_key
- test $TRAVIS_BRANCH = "release" && bash scripts/ci/building/merge_release_into_dev_and_master.sh;


@@ -1,13 +1,15 @@
#!/bin/bash

git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
git fetch --all
git remote set-url origin git@github.com:iteratec/OpenSpeedMonitor.git
git remote -v
git add .
git commit -m "Committing package-lock.json and build.gradle of release"
git push
git checkout develop
git merge release
git push https://iteraspeed:$GITHUB_USER_TOKEN@github.com/iteratec/OpenSpeedMonitor.git
git push
git checkout master
git merge release
git push https://iteraspeed:$GITHUB_USER_TOKEN@github.com/iteratec/OpenSpeedMonitor.git
git push

0 comments on commit 1742af3

Please sign in to comment.
You can’t perform that action at this time.