From d16b7d8f1b8bff7b646d9b9ff2c81ec699c64c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Bu=C3=9Fmann?= Date: Sun, 5 Jun 2022 10:38:00 +0200 Subject: [PATCH] updated bitbucket-sync.yml --- .github/workflows/bitbucket-sync.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bitbucket-sync.yml b/.github/workflows/bitbucket-sync.yml index bc6711b..22879f1 100644 --- a/.github/workflows/bitbucket-sync.yml +++ b/.github/workflows/bitbucket-sync.yml @@ -21,7 +21,8 @@ jobs: runs-on: ubuntu-latest env: - UPSTREAM: ssh://git@bitbucket.ase.in.tum.de:7999/eist22t02/eist22t02-whattocool48.git + UPSTREAM: git@github.com:babyygemperor/test-repo.git + BITBUCKET_PUB_KEY: "[bitbucket.ase.in.tum.de]:7999,[131.159.89.140]:7999 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCO2i69e5LJibEDwVrwG9edX+xqeRB/Do+C8dNclgB5lFJjA5MlTFAZ4WewbLBeGXGAc5O64ckBlI82+FI1GwIkiKRoi/9qe+NGLmZFsjBRSz2fHLfKo/iEa8ytPP9E4iql1u7Rl+pnmY2claJ+ABQOt4XQgLWjYcIBHWpwhQ9tRjg73zUI/n/PKyEnODR14bEzJ/fBmTMgnm1ZdtSPViqLmByXgjgorCWPsRA3DrPsH3A9ncietUPj/qRbsWsPhiKK1yXXaKDHDgRD7ennVrwCAYG2hhTZEbZcjE8bbe9UY9WrRtoWLFKB/xDTn7pRv+ZxqXlcoP224we7J9s2ke1H" # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -40,8 +41,17 @@ jobs: - name: Copy ssh public_key run: echo "${{SECRETS.PUBLIC_KEY}}" > ~/.ssh/id_rsa.pub - - name: Pull upstream + - name: Add bitbucket to known SSH-HOST + run: echo ${{env.BITBUCKET_PUB_KEY}} >> ~/.ssh/known_hosts + + - name: Pull origin run: git fetch --unshallow + - name: Specify Identity in case of rebasing + run: git config --global user.email "organisation-name@github.com" && git config --global user.name "GitHub Action Runner" + + - name: Fix merge conflicts if any + run: git pull --rebase upstream main + - name: Git push to other repo run: git push upstream