From 2cf1caa19fa55087cac7bfbd5eb7bd073c848fc8 Mon Sep 17 00:00:00 2001 From: Nikita Menkovich Date: Thu, 23 May 2024 17:11:57 +0200 Subject: [PATCH] fix: fix for rebase (#1264) --- .github/workflows/build_and_test_cmake.yaml | 4 ++-- .github/workflows/build_and_test_on_demand.yaml | 6 ++++-- .github/workflows/build_and_test_on_demand_cmake.yaml | 6 ++++-- .github/workflows/build_and_test_ya.yaml | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_and_test_cmake.yaml b/.github/workflows/build_and_test_cmake.yaml index 5f3beacf269..03117769d75 100644 --- a/.github/workflows/build_and_test_cmake.yaml +++ b/.github/workflows/build_and_test_cmake.yaml @@ -58,8 +58,8 @@ jobs: if: ${{ github.event.pull_request.head.sha != '' && contains(github.event.pull_request.labels.*.name, 'rebase') }} shell: bash run: | - git config --global user.email "librarian@nebius.com" - git config --global user.name "Rebase Robotovich" + git config user.email "librarian@nebius.com" + git config user.name "Rebase Robotovich" git fetch origin ${{ github.event.pull_request.base.ref }} git rebase origin/${{ github.event.pull_request.base.ref }} - name: Checkout diff --git a/.github/workflows/build_and_test_on_demand.yaml b/.github/workflows/build_and_test_on_demand.yaml index fafe84deaa8..6c61d54c50d 100644 --- a/.github/workflows/build_and_test_on_demand.yaml +++ b/.github/workflows/build_and_test_on_demand.yaml @@ -141,8 +141,8 @@ jobs: if: ${{ github.event.pull_request.head.sha != '' && contains(github.event.pull_request.labels.*.name, 'rebase') }} shell: bash run: | - git config --global user.email "librarian@nebius.com" - git config --global user.name "Rebase Robotovich" + git config user.email "librarian@nebius.com" + git config user.name "Rebase Robotovich" git fetch origin ${{ github.event.pull_request.base.ref }} git rebase origin/${{ github.event.pull_request.base.ref }} - name: checkout @@ -236,6 +236,8 @@ jobs: if: ${{ github.event.pull_request.head.sha != '' && contains(github.event.pull_request.labels.*.name, 'rebase') }} shell: bash run: | + git config user.email "librarian@nebius.com" + git config user.name "Rebase Robotovich" git fetch origin ${{ github.event.pull_request.base.ref }} git rebase origin/${{ github.event.pull_request.base.ref }} - name: checkout diff --git a/.github/workflows/build_and_test_on_demand_cmake.yaml b/.github/workflows/build_and_test_on_demand_cmake.yaml index 4847cd4127a..f5e589e3bef 100644 --- a/.github/workflows/build_and_test_on_demand_cmake.yaml +++ b/.github/workflows/build_and_test_on_demand_cmake.yaml @@ -67,8 +67,8 @@ jobs: if: ${{ github.event.pull_request.head.sha != '' && contains(github.event.pull_request.labels.*.name, 'rebase') }} shell: bash run: | - git config --global user.email "librarian@nebius.com" - git config --global user.name "Rebase Robotovich" + git config user.email "librarian@nebius.com" + git config user.name "Rebase Robotovich" git fetch origin ${{ github.event.pull_request.base.ref }} git rebase origin/${{ github.event.pull_request.base.ref }} - name: checkout @@ -149,6 +149,8 @@ jobs: if: ${{ github.event.pull_request.head.sha != '' && contains(github.event.pull_request.labels.*.name, 'rebase') }} shell: bash run: | + git config user.email "librarian@nebius.com" + git config user.name "Rebase Robotovich" git fetch origin ${{ github.event.pull_request.base.ref }} git rebase origin/${{ github.event.pull_request.base.ref }} - name: checkout diff --git a/.github/workflows/build_and_test_ya.yaml b/.github/workflows/build_and_test_ya.yaml index f09785988a7..177d2a7ba4d 100644 --- a/.github/workflows/build_and_test_ya.yaml +++ b/.github/workflows/build_and_test_ya.yaml @@ -102,8 +102,8 @@ jobs: if: ${{ github.event.pull_request.head.sha != '' && contains(github.event.pull_request.labels.*.name, 'rebase') }} shell: bash run: | - git config --global user.email "librarian@nebius.com" - git config --global user.name "Rebase Robotovich" + git config user.email "librarian@nebius.com" + git config user.name "Rebase Robotovich" git fetch origin ${{ github.event.pull_request.base.ref }} git rebase origin/${{ github.event.pull_request.base.ref }} - name: Checkout