Skip to content

Commit b9936cd

Browse files
committed
Remove redundant git pull --rebase that causes failures
The initial `git pull --rebase origin data` in commit steps was causing failures when there were unstaged changes from previous steps. Since we are committing and pushing new files, we do not need to rebase with remote first - the retry loop will handle any conflicts if needed. Files modified: - Removed `git pull --rebase` from all 12 workflow commit steps - Kept the guarded `git pull --rebase` within retry loops (for conflict resolution)
1 parent f3ac4e5 commit b9936cd

12 files changed

Lines changed: 0 additions & 12 deletions

.github/workflows/data-update-base-files-info.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ jobs:
4747
4848
git fetch origin data
4949
git checkout data
50-
git pull --rebase origin data
5150
5251
mkdir -p data
5352
mv base-files.json data/base-files.json

.github/workflows/data-update-download-index.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ jobs:
114114
115115
git fetch origin data
116116
git checkout data
117-
git pull --rebase origin data
118117
119118
mkdir -p data
120119
cp "${GITHUB_WORKSPACE}/armbian-images.json" data/

.github/workflows/data-update-image-info.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ jobs:
5757
5858
git fetch origin data
5959
git checkout data
60-
git pull --rebase origin data
6160
6261
mkdir -p data
6362
mv "${{ github.workspace }}/build/output/info/image-info.json" data/

.github/workflows/data-update-jira-excerpt.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ jobs:
159159
160160
git fetch origin data
161161
git checkout data
162-
git pull --rebase origin data
163162
164163
mkdir -p data
165164
mv "${{ github.workspace }}/jira-current.html" data/

.github/workflows/data-update-partners-data.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ jobs:
153153
154154
git fetch origin data
155155
git checkout data
156-
git pull --rebase origin data
157156
158157
mkdir -p data
159158
cp "${{ github.workspace }}/partners.json" data/

.github/workflows/generate-actions-report.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ jobs:
130130
131131
git fetch origin data
132132
git checkout data
133-
git pull --rebase origin data
134133
135134
git add data/actions-report/
136135
if ! git diff --cached --quiet; then

.github/workflows/generate-build-lists.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ jobs:
9898
9999
git fetch origin data
100100
git checkout data
101-
git pull --rebase origin data
102101
103102
git add data/release-targets/
104103
if ! git diff --cached --quiet; then

.github/workflows/generate-keyring-data.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ jobs:
143143
144144
git fetch origin data
145145
git checkout data
146-
git pull --rebase origin data
147146
148147
git add data/keyrings/
149148

.github/workflows/generate-motd.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ jobs:
4343
4444
git fetch origin data
4545
git checkout data
46-
git pull --rebase origin data
4746
4847
mkdir -p data
4948
mv "${{ github.workspace }}/quotes.txt" data/

.github/workflows/generate-servers-jsons.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ jobs:
137137
138138
git fetch origin data
139139
git checkout data
140-
git pull --rebase origin data
141140
142141
# Restore the generated files
143142
mkdir -p data/servers

0 commit comments

Comments
 (0)