From 275e51221f9cfcc4ecbb51ff517cb41c3527ac62 Mon Sep 17 00:00:00 2001 From: Rafael Gonzaga Date: Tue, 20 Jun 2023 18:10:22 -0300 Subject: [PATCH 1/2] src: revert IS_RELEASE --- src/node_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_version.h b/src/node_version.h index 20e985d6341c77..d477f632fd6cf9 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -29,7 +29,7 @@ #define NODE_VERSION_IS_LTS 0 #define NODE_VERSION_LTS_CODENAME "" -#define NODE_VERSION_IS_RELEASE 1 +#define NODE_VERSION_IS_RELEASE 0 #ifndef NODE_STRINGIFY #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n) From e0ec294255f33656dabd414605987c82b51424ba Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Tue, 20 Jun 2023 20:45:07 -0700 Subject: [PATCH 2/2] tools: pin ruff version number New versions have new rules and end up breaking builds unexpectedly. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b0a0b8a9fc106b..b1c267ed5526fe 100644 --- a/Makefile +++ b/Makefile @@ -1495,8 +1495,8 @@ cpplint: lint-cpp # Try with '--system' if it fails without; the system may have set '--user' lint-py-build: $(info Pip installing ruff on $(shell $(PYTHON) --version)...) - $(PYTHON) -m pip install --upgrade --target tools/pip/site-packages ruff || \ - $(PYTHON) -m pip install --upgrade --system --target tools/pip/site-packages ruff + $(PYTHON) -m pip install --upgrade --target tools/pip/site-packages ruff==0.0.272 || \ + $(PYTHON) -m pip install --upgrade --system --target tools/pip/site-packages ruff==0.0.272 .PHONY: lint-py ifneq ("","$(wildcard tools/pip/site-packages/ruff)")