From 18ac7ed80c538f91eef69d3eac9dd5141dc6b887 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Tue, 8 Oct 2024 17:00:11 -0400 Subject: [PATCH 1/7] ci(submodule): change branch --- .gitea/workflows/submodule.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/submodule.yaml b/.gitea/workflows/submodule.yaml index d83c038..13bd0b3 100644 --- a/.gitea/workflows/submodule.yaml +++ b/.gitea/workflows/submodule.yaml @@ -3,7 +3,7 @@ name: submodules sync on: push: branches: - - master + - submodule jobs: sync: -- 2.30.2 From 32ff1059ab138316d3c4d6485453909c76b11497 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Tue, 8 Oct 2024 17:01:54 -0400 Subject: [PATCH 2/7] ci(submodule): show status --- .gitea/workflows/submodule.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/submodule.yaml b/.gitea/workflows/submodule.yaml index 13bd0b3..a9df6b5 100644 --- a/.gitea/workflows/submodule.yaml +++ b/.gitea/workflows/submodule.yaml @@ -29,4 +29,9 @@ jobs: git submodule update --remote --recursive - name: Commit update run: | - git commit -am "chore: update submodule references" && git push || echo "No changes to commit" + git status + git submodule status + git commit -am "chore: update submodule references" + git status + git submodule status + git push || echo "No changes to commit" -- 2.30.2 From 8702efc7770adece27dd3cc083a6d875095ac724 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 8 Oct 2024 21:06:39 +0000 Subject: [PATCH 3/7] chore: update submodule references --- examples/diff/basic | 2 +- examples/diff/complex | 2 +- examples/healthcheck/release | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/diff/basic b/examples/diff/basic index cc5d991..0ca3a82 160000 --- a/examples/diff/basic +++ b/examples/diff/basic @@ -1 +1 @@ -Subproject commit cc5d991cb401b0c8cfd8e03a76fb9994158d2819 +Subproject commit 0ca3a8225b0c5f85adb5655bb87db7823f551861 diff --git a/examples/diff/complex b/examples/diff/complex index f29fbda..c1ce097 160000 --- a/examples/diff/complex +++ b/examples/diff/complex @@ -1 +1 @@ -Subproject commit f29fbdac51f851e782f0db13f8640c6ba0aec49d +Subproject commit c1ce0979157041f6c1ddb5215c5e2e4c056f0007 diff --git a/examples/healthcheck/release b/examples/healthcheck/release index 8a91338..48c2d38 160000 --- a/examples/healthcheck/release +++ b/examples/healthcheck/release @@ -1 +1 @@ -Subproject commit 8a91338da01c8fb0051b1d0183d503073535e337 +Subproject commit 48c2d3850bba983857efc4d50e81190202589ead -- 2.30.2 From 2f10167b880f74ef0d7b5b8286006cbdad06d73b Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Tue, 8 Oct 2024 17:13:51 -0400 Subject: [PATCH 4/7] ci(submodule): normal git push --- .gitea/workflows/submodule.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/submodule.yaml b/.gitea/workflows/submodule.yaml index a9df6b5..1fcb60f 100644 --- a/.gitea/workflows/submodule.yaml +++ b/.gitea/workflows/submodule.yaml @@ -34,4 +34,4 @@ jobs: git commit -am "chore: update submodule references" git status git submodule status - git push || echo "No changes to commit" + git push -- 2.30.2 From bd003dfcf63d1439ab6396fb33b448007023d5c4 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Tue, 8 Oct 2024 17:19:35 -0400 Subject: [PATCH 5/7] ci(submodule): only commit on diff --- .gitea/workflows/submodule.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/submodule.yaml b/.gitea/workflows/submodule.yaml index 1fcb60f..3167645 100644 --- a/.gitea/workflows/submodule.yaml +++ b/.gitea/workflows/submodule.yaml @@ -31,7 +31,7 @@ jobs: run: | git status git submodule status - git commit -am "chore: update submodule references" + git diff-index --quiet HEAD || git commit -am "chore: update submodule references" git status git submodule status git push -- 2.30.2 From 5f576e2b0f85f8d59ad1cb2ba75ae22be80de5e7 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Tue, 8 Oct 2024 17:20:21 -0400 Subject: [PATCH 6/7] ci(submodule): specify shell --- .gitea/workflows/submodule.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/submodule.yaml b/.gitea/workflows/submodule.yaml index 3167645..48a5ace 100644 --- a/.gitea/workflows/submodule.yaml +++ b/.gitea/workflows/submodule.yaml @@ -28,6 +28,7 @@ jobs: git pull --recurse-submodules git submodule update --remote --recursive - name: Commit update + shell: bash run: | git status git submodule status -- 2.30.2 From 41059229236c94f0986d7430daa9f0963b91acf3 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Tue, 8 Oct 2024 17:25:30 -0400 Subject: [PATCH 7/7] ci(submodule): prepare merge --- .gitea/workflows/submodule.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitea/workflows/submodule.yaml b/.gitea/workflows/submodule.yaml index 48a5ace..5a2acf4 100644 --- a/.gitea/workflows/submodule.yaml +++ b/.gitea/workflows/submodule.yaml @@ -3,7 +3,7 @@ name: submodules sync on: push: branches: - - submodule + - master jobs: sync: @@ -30,9 +30,5 @@ jobs: - name: Commit update shell: bash run: | - git status - git submodule status git diff-index --quiet HEAD || git commit -am "chore: update submodule references" - git status - git submodule status git push -- 2.30.2