-
Notifications
You must be signed in to change notification settings - Fork 6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Various CI fixes and cleanup #8289
Merged
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
9058e41
Add --fail flag to curl calls
web-flow 0a94d26
Don't update Python unless the version actually differs
web-flow 2e8e98f
Make Redis build quieter
web-flow 85adfdb
Simplify install-strace.sh
web-flow 06ecb67
Move install-cython-examples.sh into ci.sh
web-flow 4dec6cb
Move install-ray.sh and install_npm_project into ci.sh
web-flow 9f8683e
Simplify Go installation
web-flow 756ba91
Make CI less noisy
web-flow 13e2bda
Install Bazel to /usr/local/bin, move PYTHON3_BIN_PATH to a patch, an…
web-flow e82e7f5
Move lint before build so that it finishes faster
web-flow 9fafc02
Merge stdout and stderr on GitHub Actions
web-flow 216c404
Update reload_env, simplify code, and update build documentation
web-flow 61ea87e
Translate some more GitHub Actions environment variables
web-flow 73e6073
Rename build sections to allow before_install to come earlier
web-flow d1bc395
Update Anaconda and use proper conda activation instead of relying on…
web-flow 25a6a16
9fbf6bb
e549b20
3756428
Lower CI script line lengths
web-flow 696d5a8
Register LLVM installation instead of making Bash stubs
web-flow cff0919
Merge remote-tracking branch 'remotes/upstream/master' into ci-cleanup
web-flow File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| diff --git deps/jemalloc/configure deps/jemalloc/configure | ||
| --- deps/jemalloc/configure | ||
| +++ deps/jemalloc/configure | ||
| @@ -7094 +7094 @@ | ||
| -ARFLAGS='crus' | ||
| +ARFLAGS='crs' | ||
| diff --git deps/jemalloc/Makefile.in deps/jemalloc/Makefile.in | ||
| --- deps/jemalloc/Makefile.in | ||
| +++ deps/jemalloc/Makefile.in | ||
| @@ -370 +370 @@ | ||
| - @if ! `cmp -s $< $@` ; then echo "cp $< $<"; cp $< $@ ; fi | ||
| + @if ! `cmp -s $< $@` ; then cp $< $@ ; fi | ||
| diff --git deps/Makefile deps/Makefile | ||
| --- deps/Makefile | ||
| +++ deps/Makefile | ||
| @@ -45 +45 @@ | ||
| - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) | ||
| +# @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) | ||
| @@ -51 +51 @@ | ||
| - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) | ||
| +# @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) | ||
| @@ -61 +61 @@ | ||
| -LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS) | ||
| +LUA_CFLAGS+= -O2 -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS) | ||
| @@ -67 +67 @@ | ||
| -ARFLAGS=rcu | ||
| +ARFLAGS=rc | ||
| @@ -70 +70 @@ | ||
| - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) | ||
| +# @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) | ||
| @@ -75 +75 @@ | ||
| -JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS) | ||
| +JEMALLOC_CFLAGS= -std=gnu99 -pipe -g3 -O3 -funroll-loops $(CFLAGS) | ||
| @@ -79,2 +79,2 @@ | ||
| - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) | ||
| +# @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) | ||
| - cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" | ||
| + cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --silent CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" | ||
| diff --git src/Makefile src/Makefile | ||
| --- src/Makefile | ||
| +++ src/Makefile | ||
| @@ -176,3 +176,3 @@ | ||
| - @echo "" | ||
| +# @echo "" | ||
| - @echo "Hint: It's a good idea to run 'make test' ;)" | ||
| +# @echo "Hint: It's a good idea to run 'make test' ;)" | ||
| - @echo "" | ||
| +# @echo "" | ||
| -- | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what happen when redis update and this patch break?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the question is more of "how likely will that happen"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good question! I think fixing it in the event of a breakage shouldn't need more than 5 minutes—it's just a matter of copy/pasting a few changed lines.
Note that we don't just update Redis randomly. We have much more difficult patches to take care of for Windows compatibility and such (see the existing patches). So I think the overhead is negligible. And it's also a really significant gain in terms of how much noise it cuts down on in the builds (that itself wastes a lot of time). And in any case this patch is trivial enough to comment out if it somehow becomes a problem.