Skip to content

Merge main from trac@sapsailing.com:/home/trac/git #14455

Merge main from trac@sapsailing.com:/home/trac/git

Merge main from trac@sapsailing.com:/home/trac/git #14455

# One of the reasons to have this workflow is that the Gollum-based Wiki
# at wiki.sapsailing.com is operating on a Git workspace at wiki@sapsailing.com:gitwiki
# which has been cloned from ssh://trac@sapsailing.com/home/trac/git. Its changes
# shall be synchronized to the Github repo at github.com/SAP/sailing-analytics
name: Merge main from trac@sapsailing.com:/home/trac/git
on:
schedule:
- cron: "53 * * * *" # every hour, at :53 minutes
workflow_dispatch: {}
jobs:
merge-master-from-sapsailing-com:
permissions:
contents: write
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0 # fetch the whole thing to make sure the histories merge
- name: Create SSH key and fetch repo from sapsailing.com
shell: bash
run: |
mkdir -p ~/.ssh
chmod 700 ~/.ssh
echo "${{ secrets.SSH_PRIVATE_KEY_FOR_TRAC_SAPSAILING_COM }}" >~/.ssh/id_ed25519
chmod 600 ~/.ssh/id_ed25519
git remote add sapsailing ssh://trac@sapsailing.com/home/trac/git
git remote -v
GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git fetch sapsailing main:sapsailing_main
GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git push -f origin sapsailing_main:sapsailing_main
- name: Merge sapsailing/main into main
uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # v1.4.0
env:
GH_TOKEN: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}
with:
type: now
from_branch: sapsailing_main
target_branch: main
message: Auto-merging sapsailing/main into github/main
github_token: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}