@rizom/ops 0.2.0-alpha.24 → 0.2.0-alpha.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -293,8 +293,22 @@ jobs:
|
|
|
293
293
|
if git diff --quiet -- users views; then
|
|
294
294
|
exit 0
|
|
295
295
|
fi
|
|
296
|
+
|
|
297
|
+
git fetch origin "${{ github.ref_name }}"
|
|
298
|
+
if git diff --quiet "origin/${{ github.ref_name }}" -- users views; then
|
|
299
|
+
exit 0
|
|
300
|
+
fi
|
|
301
|
+
|
|
302
|
+
patch_file="$(mktemp)"
|
|
303
|
+
git diff --binary -- users views > "$patch_file"
|
|
304
|
+
git reset --hard "origin/${{ github.ref_name }}"
|
|
305
|
+
git apply --3way --index "$patch_file"
|
|
306
|
+
|
|
307
|
+
if git diff --cached --quiet -- users views; then
|
|
308
|
+
exit 0
|
|
309
|
+
fi
|
|
310
|
+
|
|
296
311
|
git config user.name "github-actions[bot]"
|
|
297
312
|
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
|
298
|
-
git add users views
|
|
299
313
|
git commit -m "chore(ops): reconcile generated config"
|
|
300
314
|
git push origin HEAD:${{ github.ref_name }}
|
|
@@ -38,8 +38,22 @@ jobs:
|
|
|
38
38
|
if git diff --quiet -- views users; then
|
|
39
39
|
exit 0
|
|
40
40
|
fi
|
|
41
|
+
|
|
42
|
+
git fetch origin "${{ github.ref_name }}"
|
|
43
|
+
if git diff --quiet "origin/${{ github.ref_name }}" -- views users; then
|
|
44
|
+
exit 0
|
|
45
|
+
fi
|
|
46
|
+
|
|
47
|
+
patch_file="$(mktemp)"
|
|
48
|
+
git diff --binary -- views users > "$patch_file"
|
|
49
|
+
git reset --hard "origin/${{ github.ref_name }}"
|
|
50
|
+
git apply --3way --index "$patch_file"
|
|
51
|
+
|
|
52
|
+
if git diff --cached --quiet -- views users; then
|
|
53
|
+
exit 0
|
|
54
|
+
fi
|
|
55
|
+
|
|
41
56
|
git config user.name "github-actions[bot]"
|
|
42
57
|
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
|
43
|
-
git add views users
|
|
44
58
|
git commit -m "chore(ops): reconcile pilot outputs"
|
|
45
59
|
git push origin HEAD:${{ github.ref_name }}
|