From dd81cdb627e97ca3e873253b3618c9da3ae092d8 Mon Sep 17 00:00:00 2001 From: alexgiving Date: Fri, 13 Oct 2023 19:29:48 +0300 Subject: [PATCH 01/12] init --- .github/sync_master.sh | 6 ++++++ .github/workflows/workflow.yaml | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 .github/sync_master.sh diff --git a/.github/sync_master.sh b/.github/sync_master.sh new file mode 100644 index 0000000..46914ec --- /dev/null +++ b/.github/sync_master.sh @@ -0,0 +1,6 @@ +#!bin/bash + +echo "Feth master" + +git fetch --all +git merge origin/master diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index bdcf5a9..db60ee4 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -20,6 +20,8 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 + shell: bash + run: bash .github/sync.sh - name: Build Stage shell: bash From 31cea27e7b5a7c08ab8d38a09c7599d4625266e9 Mon Sep 17 00:00:00 2001 From: alexgiving Date: Fri, 13 Oct 2023 19:31:40 +0300 Subject: [PATCH 02/12] fix --- .github/workflows/workflow.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index db60ee4..e7242d5 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -20,6 +20,8 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 + + - name: Sync master shell: bash run: bash .github/sync.sh From c6cd6058bf21ec012bfb7469b4ec5a5bb5a26de7 Mon Sep 17 00:00:00 2001 From: alexgiving Date: Fri, 13 Oct 2023 19:33:42 +0300 Subject: [PATCH 03/12] fix --- .github/workflows/workflow.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index e7242d5..68a8426 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -23,7 +23,10 @@ jobs: - name: Sync master shell: bash - run: bash .github/sync.sh + run: | + echo "Feth master" + git fetch --all + git merge origin/master - name: Build Stage shell: bash From 66728d487321a0e71b4d0023ec9e6eb71d695753 Mon Sep 17 00:00:00 2001 From: alexgiving Date: Fri, 13 Oct 2023 19:36:59 +0300 Subject: [PATCH 04/12] test --- .github/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 68a8426..7344077 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -26,7 +26,7 @@ jobs: run: | echo "Feth master" git fetch --all - git merge origin/master + git merge --allow-unrelated-histories --no-commit origin/master - name: Build Stage shell: bash From 1783d2d3f574597da98983934fb689b3f0dcb267 Mon Sep 17 00:00:00 2001 From: alexgiving Date: Fri, 13 Oct 2023 19:38:50 +0300 Subject: [PATCH 05/12] test --- .github/workflows/workflow.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 7344077..26ed0ff 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -26,6 +26,8 @@ jobs: run: | echo "Feth master" git fetch --all + git config --local user.name "" + git config --local user.email "" git merge --allow-unrelated-histories --no-commit origin/master - name: Build Stage From 7f870dee8578bc99806673aa6d6969fccad28ec7 Mon Sep 17 00:00:00 2001 From: alexgiving Date: Fri, 13 Oct 2023 19:40:01 +0300 Subject: [PATCH 06/12] test --- .github/workflows/workflow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 26ed0ff..bed253f 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -26,8 +26,8 @@ jobs: run: | echo "Feth master" git fetch --all - git config --local user.name "" - git config --local user.email "" + git config --local user.name "ADE CI" + git config --local user.email "ade_ci@intel.com" git merge --allow-unrelated-histories --no-commit origin/master - name: Build Stage From 1c6b5051cfa89c06c5940076648bbea72113bf00 Mon Sep 17 00:00:00 2001 From: alexgiving Date: Fri, 13 Oct 2023 19:41:31 +0300 Subject: [PATCH 07/12] 1 --- .github/workflows/workflow.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index bed253f..5f1179f 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -26,6 +26,7 @@ jobs: run: | echo "Feth master" git fetch --all + git pull git config --local user.name "ADE CI" git config --local user.email "ade_ci@intel.com" git merge --allow-unrelated-histories --no-commit origin/master From 178b6018a3e29cad327b0c1124ebf146337e8bc6 Mon Sep 17 00:00:00 2001 From: alexgiving Date: Fri, 13 Oct 2023 19:46:20 +0300 Subject: [PATCH 08/12] 2 --- .github/workflows/workflow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 5f1179f..438dbf5 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -25,10 +25,10 @@ jobs: shell: bash run: | echo "Feth master" - git fetch --all - git pull + git fetch origin git config --local user.name "ADE CI" git config --local user.email "ade_ci@intel.com" + git status git merge --allow-unrelated-histories --no-commit origin/master - name: Build Stage From 82fbb18b19d7113a64774117aa9e7a19ec82cea1 Mon Sep 17 00:00:00 2001 From: alexgiving Date: Fri, 13 Oct 2023 19:50:59 +0300 Subject: [PATCH 09/12] 4 --- .github/workflows/workflow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 438dbf5..50ac1c3 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -28,8 +28,8 @@ jobs: git fetch origin git config --local user.name "ADE CI" git config --local user.email "ade_ci@intel.com" - git status - git merge --allow-unrelated-histories --no-commit origin/master + git checkout origin/master + git merge --allow-unrelated-histories --no-commit ${{ github.ref_name }} - name: Build Stage shell: bash From f6f701aca2bb8cf42e932b4874298db1b38566d6 Mon Sep 17 00:00:00 2001 From: alexgiving Date: Fri, 13 Oct 2023 19:59:36 +0300 Subject: [PATCH 10/12] test --- .github/workflows/workflow.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 50ac1c3..d808879 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -20,16 +20,17 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 + with: + sparse-checkout: . - name: Sync master shell: bash run: | echo "Feth master" - git fetch origin + git fetch origin/master git config --local user.name "ADE CI" git config --local user.email "ade_ci@intel.com" - git checkout origin/master - git merge --allow-unrelated-histories --no-commit ${{ github.ref_name }} + git merge --allow-unrelated-histories --no-commit origin/master - name: Build Stage shell: bash From 25fcf0a096a166bc2bf521492c195930eb773acd Mon Sep 17 00:00:00 2001 From: alexgiving Date: Fri, 13 Oct 2023 20:02:51 +0300 Subject: [PATCH 11/12] ttt --- .github/workflows/workflow.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index d808879..64851b1 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -20,16 +20,14 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - with: - sparse-checkout: . - name: Sync master shell: bash run: | echo "Feth master" git fetch origin/master - git config --local user.name "ADE CI" - git config --local user.email "ade_ci@intel.com" + git config user.name "ADE CI" + git config user.email "ade_ci@intel.com" git merge --allow-unrelated-histories --no-commit origin/master - name: Build Stage From f0f28e853e5b975f305ae39fde97a5e39c2ce036 Mon Sep 17 00:00:00 2001 From: Trutnev Aleksei Date: Thu, 26 Oct 2023 22:47:49 +0300 Subject: [PATCH 12/12] Delete .github/sync_master.sh --- .github/sync_master.sh | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .github/sync_master.sh diff --git a/.github/sync_master.sh b/.github/sync_master.sh deleted file mode 100644 index 46914ec..0000000 --- a/.github/sync_master.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!bin/bash - -echo "Feth master" - -git fetch --all -git merge origin/master