We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent fca7381 commit e9217e4Copy full SHA for e9217e4
1 file changed
.github/workflows/merge-acm-prometheus.yaml
@@ -31,9 +31,16 @@ jobs:
31
go.sum
32
.golangci.yml
33
assets-cmd: |
34
- # Force upstream Makefile in case of conflicts
35
- git checkout --theirs Makefile || true
36
- git add Makefile || true
+ # Debug: Check Makefile state
+ echo "=== Makefile lines 120-130 ==="
+ sed -n '120,130p' Makefile || echo "Failed to read Makefile"
37
+ echo "=== Test make syntax ==="
38
+ if ! make -n assets-compress >/dev/null 2>&1; then
39
+ echo "ERROR: Makefile has syntax errors!"
40
+ echo "=== Lines with 'else' ==="
41
+ grep -n 'else' Makefile || echo "No 'else' found"
42
+ fi
43
+
44
# Only compress assets if assets actually changed
45
# The git diff relies on gits remote naming. The merge-flow checks out
46
# $downstream as origin at the time of writing this code.
0 commit comments