From cb2ad2a76b4193e18be8514ca92eb04ece99d745 Mon Sep 17 00:00:00 2001 From: Terry Cojean Date: Wed, 20 Jul 2022 11:07:38 +0200 Subject: [PATCH 1/5] Use /usr/bin/env bash --- .github/abidiff.sh | 2 +- .github/bot-base.sh | 2 +- .github/bot-pr-base.sh | 2 +- .github/bot-pr-format-base.sh | 2 +- .github/check-format.sh | 2 +- .github/format-rebase.sh | 2 +- .github/format.sh | 2 +- .github/label.sh | 2 +- .github/rebase.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/abidiff.sh b/.github/abidiff.sh index 8c644dcfa38..bcc2e3bf8fe 100755 --- a/.github/abidiff.sh +++ b/.github/abidiff.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash pushd old source .github/bot-pr-base.sh diff --git a/.github/bot-base.sh b/.github/bot-base.sh index 608cd6d6308..58e3a6df7b5 100644 --- a/.github/bot-base.sh +++ b/.github/bot-base.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/.github/bot-pr-base.sh b/.github/bot-pr-base.sh index 11cd6526e11..8fe4f26f204 100644 --- a/.github/bot-pr-base.sh +++ b/.github/bot-pr-base.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source .github/bot-base.sh diff --git a/.github/bot-pr-format-base.sh b/.github/bot-pr-format-base.sh index 9ef7aba26d7..53685f680f5 100644 --- a/.github/bot-pr-format-base.sh +++ b/.github/bot-pr-format-base.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source .github/bot-pr-base.sh diff --git a/.github/check-format.sh b/.github/check-format.sh index 635b64c943f..96e3ea3616b 100755 --- a/.github/check-format.sh +++ b/.github/check-format.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash cp .github/bot-pr-format-base.sh /tmp source /tmp/bot-pr-format-base.sh diff --git a/.github/format-rebase.sh b/.github/format-rebase.sh index b470da0d77f..6fe7aff6743 100755 --- a/.github/format-rebase.sh +++ b/.github/format-rebase.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source .github/bot-pr-base.sh diff --git a/.github/format.sh b/.github/format.sh index 8829b719b8f..ab023e2fc7b 100755 --- a/.github/format.sh +++ b/.github/format.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash cp .github/bot-pr-format-base.sh /tmp source /tmp/bot-pr-format-base.sh diff --git a/.github/label.sh b/.github/label.sh index aa6b4f13f75..c954b0123fe 100755 --- a/.github/label.sh +++ b/.github/label.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source .github/bot-pr-base.sh diff --git a/.github/rebase.sh b/.github/rebase.sh index ef88df947d4..c0778254758 100755 --- a/.github/rebase.sh +++ b/.github/rebase.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source .github/bot-pr-base.sh From f69df6d75a83633b153ce31fca730a4c02b86616 Mon Sep 17 00:00:00 2001 From: Terry Cojean Date: Tue, 19 Jul 2022 12:17:05 +0200 Subject: [PATCH 2/5] Try push mirroring to gitlab --- .github/mirror.sh | 23 +++++++++++++++++++++++ .github/workflows/mirror.yml | 19 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100755 .github/mirror.sh create mode 100644 .github/workflows/mirror.yml diff --git a/.github/mirror.sh b/.github/mirror.sh new file mode 100755 index 00000000000..52aeb413fe4 --- /dev/null +++ b/.github/mirror.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash + +BRANCH_NAME=${BRANCH_NAME##*/} + +git remote add fork "git@github.com:${GITHUB_REPO}.git" +git remote add gitlab "git@gitlab.com:ginkgo-project/ginkgo-public-ci.git" + +git remote -v + +# Setup ssh +eval $(ssh-agent -s) +echo "${BOT_KEY}" | tr -d '\r' | ssh-add - >/dev/null +mkdir -p ~/.ssh +chmod 700 ~/.ssh +ssh-keyscan -t rsa gitlab.com github.com >>~/.ssh/known_hosts +git config user.email "ginkgo.library@gmail.com" +git config user.name "Ginkgo Bot" + +# Fetch from github +git fetch fork "$BRANCH_NAME" +git checkout -b fork/$BRANCH_NAME +# Push to gitlab +git push --force --prune gitlab $BRANCH_NAME diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml new file mode 100644 index 00000000000..cfde5c7f267 --- /dev/null +++ b/.github/workflows/mirror.yml @@ -0,0 +1,19 @@ +name: Mirroring +on: push + +jobs: + to_gitlab: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + ref: develop + fetch-depth: 0 + persist-credentials: false + - name: Push to Gitlab + run: cp --preserve .github/mirror.sh /tmp && /tmp/mirror.sh + env: + BOT_KEY: ${{ secrets.GITLAB_MIRROR_PRIV_KEY }} + BRANCH_NAME: ${{ github.ref }} + GITHUB_REPO: ${{ github.repository }} From df3493cc29db6148e0826e8305ea6ddd9818621c Mon Sep 17 00:00:00 2001 From: Terry Cojean Date: Thu, 21 Jul 2022 14:45:26 +0200 Subject: [PATCH 3/5] fix --- .github/mirror.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/mirror.sh b/.github/mirror.sh index 52aeb413fe4..c6ba253e34c 100755 --- a/.github/mirror.sh +++ b/.github/mirror.sh @@ -18,6 +18,7 @@ git config user.name "Ginkgo Bot" # Fetch from github git fetch fork "$BRANCH_NAME" -git checkout -b fork/$BRANCH_NAME +git checkout -b "$BRANCH_NAME" +git reset --hard fork/"$BRANCH_NAME" # Push to gitlab -git push --force --prune gitlab $BRANCH_NAME +git push -u --force --prune gitlab HEAD:$BRANCH_NAME From 7ae922d9145c3b12e47207057e08c8d728040f56 Mon Sep 17 00:00:00 2001 From: Terry Cojean Date: Fri, 22 Jul 2022 08:41:46 +0200 Subject: [PATCH 4/5] Delete unneeded settings Co-authored-by: Tobias Ribizel --- .github/mirror.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/mirror.sh b/.github/mirror.sh index c6ba253e34c..bdc34989a16 100755 --- a/.github/mirror.sh +++ b/.github/mirror.sh @@ -13,8 +13,6 @@ echo "${BOT_KEY}" | tr -d '\r' | ssh-add - >/dev/null mkdir -p ~/.ssh chmod 700 ~/.ssh ssh-keyscan -t rsa gitlab.com github.com >>~/.ssh/known_hosts -git config user.email "ginkgo.library@gmail.com" -git config user.name "Ginkgo Bot" # Fetch from github git fetch fork "$BRANCH_NAME" From e37217417c068ba6aca2f823c5e74869899312ae Mon Sep 17 00:00:00 2001 From: Terry Cojean Date: Fri, 22 Jul 2022 09:50:30 +0200 Subject: [PATCH 5/5] Make sure checkout will work, remove prune Co-authored-by: Yuhsiang M. Tsai --- .github/mirror.sh | 4 ++-- .github/workflows/mirror.yml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/mirror.sh b/.github/mirror.sh index bdc34989a16..f7a407601f3 100755 --- a/.github/mirror.sh +++ b/.github/mirror.sh @@ -16,7 +16,7 @@ ssh-keyscan -t rsa gitlab.com github.com >>~/.ssh/known_hosts # Fetch from github git fetch fork "$BRANCH_NAME" -git checkout -b "$BRANCH_NAME" +git checkout -B "$BRANCH_NAME" git reset --hard fork/"$BRANCH_NAME" # Push to gitlab -git push -u --force --prune gitlab HEAD:$BRANCH_NAME +git push -u --force gitlab HEAD:$BRANCH_NAME diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index cfde5c7f267..a9efec66e34 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -9,7 +9,6 @@ jobs: uses: actions/checkout@v2 with: ref: develop - fetch-depth: 0 persist-credentials: false - name: Push to Gitlab run: cp --preserve .github/mirror.sh /tmp && /tmp/mirror.sh