Skip to content

Commit e8b60b0

Browse files
committed
disable coverage job && update sync job
1 parent cc065d4 commit e8b60b0

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

.github/workflows/job_coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313

1414
build:
15-
if: github.server_url != 'https://github.com'
15+
if: github.server_url == 'zhttps://github.com'
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: checkout code

.github/workflows/job_sync.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ jobs:
2323
git clone --filter=blob:none --filter=tree:0 --branch master --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
2424
cd repo
2525
git remote add --no-tags --fetch --track master upstream https://github.com/${GITHUB_REPOSITORY}
26-
git merge upstream/master
27-
git push upstream master --progress
28-
git push origin master --progress
26+
git diff --stat master upstream/master
27+
git pull -v --rebase upstream master
28+
git push upstream master -v --progress
29+
git push origin master -v --progress
2930
cd ../
3031
rm -rf repo
3132
@@ -34,9 +35,10 @@ jobs:
3435
git clone --filter=blob:none --filter=tree:0 --branch v3 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
3536
cd repo
3637
git remote add --no-tags --fetch --track v3 upstream https://github.com/${GITHUB_REPOSITORY}
37-
git merge upstream/v3
38-
git push upstream v3 --progress
39-
git push origin v3 --progress
38+
git diff --stat v3 upstream/v3
39+
git pull -v --rebase upstream v3
40+
git push upstream v3 -v --progress
41+
git push origin v3 -v --progress
4042
cd ../
4143
rm -rf repo
4244
@@ -45,8 +47,9 @@ jobs:
4547
git clone --filter=blob:none --filter=tree:0 --branch v4 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
4648
cd repo
4749
git remote add --no-tags --fetch --track v4 upstream https://github.com/${GITHUB_REPOSITORY}
48-
git merge upstream/v4
49-
git push upstream v4 --progress
50-
git push origin v4 --progress
50+
git diff --stat v4 upstream/v4
51+
git pull -v --rebase upstream v4
52+
git push upstream v4 -v --progress
53+
git push origin v4 -v --progress
5154
cd ../
5255
rm -rf repo

0 commit comments

Comments
 (0)