CI: spring cleaning Makefile #3916
Conversation
|
Also #3915 should be merged first. |
apostasie
force-pushed
the
ci-make-tasks
branch
2 times, most recently
from
ddf9b0c to
7308908
Compare
|
CI failures are unrelated IPFS/Compose and github cache sluggishness timeouting. |
apostasie
force-pushed
the
ci-make-tasks
branch
from
7308908 to
4c6ba21
Compare
|
Failures are all timeouts from slow github cache / build. |
apostasie
force-pushed
the
ci-make-tasks
branch
from
4c6ba21 to
a23a0ad
Compare
|
Rebased. |
apostasie
force-pushed
the
ci-make-tasks
branch
from
a23a0ad to
ab442f6
Compare
| - unnecessaryBlock | ||
|
|
||
| issues: | ||
| max-issues-per-linter: 0 |
There was a problem hiding this comment.
So that golangci does not strip the output and show all the errors instead.
It is frustrating to run golangci, fix the issues, then have to run it again for "more" issues.
wdyt?
| VERSION ?= $(shell git -C $(MAKEFILE_DIR) describe --match 'v[0-9]*' --dirty='.m' --always --tags) | ||
| VERSION_TRIMMED := $(VERSION:v%=%) | ||
| REVISION ?= $(shell git -C $(MAKEFILE_DIR) rev-parse HEAD)$(shell if ! git -C $(MAKEFILE_DIR) diff --no-ext-diff --quiet --exit-code; then echo .m; fi) | ||
| LINT_COMMIT_RANGE ?= main..HEAD |
There was a problem hiding this comment.
This doesn't seem to work for release/X.X branches, which are created when we are not ready to make a release from the main branch
There was a problem hiding this comment.
Mmm. Let me test that immediately.
There was a problem hiding this comment.
If you do not want the range compared to main:
git checkout origin/release/1.7
touch foo; git add foo; git commit -S -s -m "Foo"
LINT_COMMIT_RANGE=origin/release/1.7..HEAD make lint-commits
INFO[0000] using commit range: origin/release/1.7..HEAD
* ff0ac028 "Foo" ... PASS
Can you let me know what use-case you would like?
There was a problem hiding this comment.
Overriding LINT_COMMIT_RANGE seems good.
This should be set in the GHA yaml with $GITHUB_BASE_REF
There was a problem hiding this comment.
Good point. Let me look at the workflow files right now.
There was a problem hiding this comment.
Refreshing myself on this: we do not run on the CI make lint-commits (or the overarching make lint).
The reason is that project-checks does do the git-validation for us already (and that would just duplicate the check).
I am going to add a note to the md file about proper local use of make lint-commits though.
There was a problem hiding this comment.
Done. Added a few words in the testing markdown doc about this specific point.
Let me know your thoughts.
apostasie
force-pushed
the
ci-make-tasks
branch
from
ab442f6 to
dc0d1bf
Compare
|
Needs rebase |
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
apostasie
force-pushed
the
ci-make-tasks
branch
from
dc0d1bf to
9210685
Compare
|
Rebased. Can you poke the failed run? |
2 participants
This PR cleans-up the Makefile:
nerdctlbinary name to $(BINARY)$(ORG_PREFIXES)consistentlyNote that this should be merged after #3911 as it duplicate the changes from there.