Build: simplify how protos are built #4639
Conversation
…and Makes use of timestamps to determine if files should be recompiled. Instead of touching files and altering timestamps always delete the compiled proto files when calling `protos` to make sure they are compiled every time. Removed targets to build protos, yaccs, and ragel files when trying to build loki or the canary. This isn't necesary, if you are changing these files you would know you need to build them and the `check-generated-files` should catch any changes to them not committed.
…let that run first. also removing `check-generated-files` from the `all` target because its redundant with a separate step and could also race with the parallel lint
| make('check-generated-files', container=false) { depends_on: ['clone'] }, | ||
| make('test', container=false) { depends_on: ['clone','check-generated-files'] }, | ||
| make('lint', container=false) { depends_on: ['clone','check-generated-files'] }, |
There was a problem hiding this comment.
make test and lint depend on check-generated-files so they wait for it to finish as it will rebuild protos
| loki: protos yacc ragel cmd/loki/loki | ||
| loki-debug: protos yacc ragel cmd/loki/loki-debug | ||
| loki: cmd/loki/loki | ||
| loki-debug: cmd/loki/loki-debug |
There was a problem hiding this comment.
we don't need to build protos, yacc, ragel to build loki, if someone is changing those things they will need to know how to run make protos, make yacc etc
|
|
||
| %.pb.go: $(PROTO_DEFS) | ||
| %.pb.go: |
There was a problem hiding this comment.
depending on the proto definitions triggers Makes desire to compare timestamps of file before choosing to do anything, we always want to build protos every time.
| # use with care. This signals to make that the proto definitions don't need recompiling. | ||
| touch-protos: | ||
| for proto in $(PROTO_GOS); do [ -f "./$${proto}" ] && touch "$${proto}" && echo "touched $${proto}"; done | ||
| protos: clean-protos $(PROTO_GOS) |
There was a problem hiding this comment.
delete all the compile protos so they will be guaranteed to be built every time this is called.
|
the TL;DR here is I changed the Doing this means we dont' care about any timestamps on the proto files or their generated files anymore so I removed all references to TOUCH_PROTOS and the like because we don't need this anymore |
What this PR does / why we need it:
Hopefully this helps with some flakes in our CI and issues seen locally trying to build Loki.
Instead of relying on the Make semantics of using timestamps to determine if a file should be recompiled just delete all the compiled protos every time.
Removed some dependant targets from the loki and loki canary targets, we don't need to rebuild these files to build Loki. if you are mucking around with protos or yacc files you will likely know you need to build them anyway.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Checklist
CHANGELOG.mdabout the changes.