From bfe6501de9967a6945ff7acf7248aff3a56d6048 Mon Sep 17 00:00:00 2001 From: gouzi <530971494@qq.com> Date: Thu, 29 Jun 2023 16:16:26 +0800 Subject: [PATCH 01/10] [ci] add merge check --- .github/workflows/test.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 005c73ae7..b5b0d9508 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -24,6 +24,13 @@ jobs: with: python-version: ${{ matrix.python-version }} + - name: Merge develop Branch + run: | + git checkout develop + git pull origin develop + git checkout ${{ github.head_ref }} + git merge develop + - name: Install dependencies run: | python -m pip install paddlepaddle==0.0.0 -f https://www.paddlepaddle.org.cn/whl/linux/cpu-mkl/develop.html From 18e9069f540802a9872d8aa460000d36c02a7d2a Mon Sep 17 00:00:00 2001 From: gouzi <530971494@qq.com> Date: Thu, 29 Jun 2023 16:21:54 +0800 Subject: [PATCH 02/10] ci test --- .github/workflows/test.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index b5b0d9508..4de0ee3a6 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -24,6 +24,11 @@ jobs: with: python-version: ${{ matrix.python-version }} + - name: Test + run: | + ls + pwd + - name: Merge develop Branch run: | git checkout develop From b85a102b28608826868a6f330bdaa7f755779e3f Mon Sep 17 00:00:00 2001 From: gouzi <530971494@qq.com> Date: Thu, 29 Jun 2023 16:24:38 +0800 Subject: [PATCH 03/10] ci test --- .github/workflows/test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4de0ee3a6..f6bdcd46e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -28,9 +28,11 @@ jobs: run: | ls pwd + git branch -a - name: Merge develop Branch run: | + git fetch git checkout develop git pull origin develop git checkout ${{ github.head_ref }} From e23ad53705e02c3f1a06f5e6bc8711ae24cab78e Mon Sep 17 00:00:00 2001 From: gouzi <530971494@qq.com> Date: Thu, 29 Jun 2023 16:27:47 +0800 Subject: [PATCH 04/10] ci test --- .github/workflows/test.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index f6bdcd46e..dcfd76257 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -33,9 +33,6 @@ jobs: - name: Merge develop Branch run: | git fetch - git checkout develop - git pull origin develop - git checkout ${{ github.head_ref }} git merge develop - name: Install dependencies From fa7bbbf336664477b8723dd6ce71145acbb65493 Mon Sep 17 00:00:00 2001 From: gouzi <530971494@qq.com> Date: Thu, 29 Jun 2023 16:28:45 +0800 Subject: [PATCH 05/10] ci test --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index dcfd76257..ccbed24fa 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -33,7 +33,7 @@ jobs: - name: Merge develop Branch run: | git fetch - git merge develop + git merge origin/develop - name: Install dependencies run: | From 19201bd64221a2e40835b9b26d259b5dfe2dea7a Mon Sep 17 00:00:00 2001 From: gouzi <530971494@qq.com> Date: Thu, 29 Jun 2023 16:31:49 +0800 Subject: [PATCH 06/10] ci test --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ccbed24fa..240bb313e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -33,7 +33,7 @@ jobs: - name: Merge develop Branch run: | git fetch - git merge origin/develop + git merge origin/develop --allow-unrelated-histories - name: Install dependencies run: | From 4274eee3814beb4ad56279806913db70522c1827 Mon Sep 17 00:00:00 2001 From: gouzi <530971494@qq.com> Date: Thu, 29 Jun 2023 16:33:37 +0800 Subject: [PATCH 07/10] ci test --- .github/workflows/test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 240bb313e..03e76f515 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -32,6 +32,8 @@ jobs: - name: Merge develop Branch run: | + git config --global user.email "paddlepaddle@bot.com" + git config --global user.name "paddlepaddle@bot.com" git fetch git merge origin/develop --allow-unrelated-histories From 52a9ace5b7b12b3f7daed6bb14551ba458f701f2 Mon Sep 17 00:00:00 2001 From: gouzi <530971494@qq.com> Date: Thu, 29 Jun 2023 16:46:55 +0800 Subject: [PATCH 08/10] ci test --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 03e76f515..e9aa07b7c 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -35,7 +35,7 @@ jobs: git config --global user.email "paddlepaddle@bot.com" git config --global user.name "paddlepaddle@bot.com" git fetch - git merge origin/develop --allow-unrelated-histories + git pull --tags origin develop - name: Install dependencies run: | From 44c14b5204125b53d934598407953a06e025da37 Mon Sep 17 00:00:00 2001 From: gouzi <530971494@qq.com> Date: Thu, 29 Jun 2023 16:54:44 +0800 Subject: [PATCH 09/10] ci_test --- .github/workflows/test.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e9aa07b7c..30303fcb0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -35,7 +35,9 @@ jobs: git config --global user.email "paddlepaddle@bot.com" git config --global user.name "paddlepaddle@bot.com" git fetch - git pull --tags origin develop + git branch ${{ github.head_ref }} + git checkout ${{ github.head_ref }} + git merge origin/develop --allow-unrelated-histories - name: Install dependencies run: | From 360b382ce742ae87ea1a8de2ec56414ea3353912 Mon Sep 17 00:00:00 2001 From: gouzi <530971494@qq.com> Date: Thu, 29 Jun 2023 19:36:27 +0800 Subject: [PATCH 10/10] ci test --- .github/workflows/test.yaml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 30303fcb0..c3beab88f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -8,6 +8,7 @@ on: jobs: Test: + if: github.repository == 'PaddlePaddle/PaddleSOT' strategy: fail-fast: false matrix: @@ -24,21 +25,6 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Test - run: | - ls - pwd - git branch -a - - - name: Merge develop Branch - run: | - git config --global user.email "paddlepaddle@bot.com" - git config --global user.name "paddlepaddle@bot.com" - git fetch - git branch ${{ github.head_ref }} - git checkout ${{ github.head_ref }} - git merge origin/develop --allow-unrelated-histories - - name: Install dependencies run: | python -m pip install paddlepaddle==0.0.0 -f https://www.paddlepaddle.org.cn/whl/linux/cpu-mkl/develop.html