Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/build/clang-format-diff.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ set -eo pipefail

if [[ -z $DEBUG ]]; then
brew install clang-format
curl --silent --show-error --remote-name https://raw.githubusercontent.com/llvm/llvm-project/release/18.x/clang/tools/clang-format/clang-format-diff.py
curl --silent --show-error --remote-name https://raw.githubusercontent.com/llvm/llvm-project/release/21.x/clang/tools/clang-format/clang-format-diff.py
fi
git diff --unified=0 --no-color @^ \
| python clang-format-diff.py -p1 -regex '.*\.(cpp|cc|c\+\+|cxx|c|cl|h|hh|hpp|m|mm|inc)' -sort-includes \
| python3 clang-format-diff.py -p1 -regex '.*\.(cpp|cc|c\+\+|cxx|c|cl|h|hh|hpp|m|mm|inc)' -sort-includes \
| npx suggestion-bot
12 changes: 9 additions & 3 deletions scripts/build/copy-yarnrc.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,19 @@ function main(src, dst) {
});

const yml = fs.readFileSync(src, { encoding: "utf-8" });
const rc = /** @type {Record<string, string | undefined>} */ (yaml.load(yml));
const rc = /** @type {Record<string, string | string[] | undefined>} */ (
yaml.load(yml)
);

rc["nmHoistingLimits"] = undefined;
rc["plugins"] = undefined;
rc["plugins"] = [];

if (rc.globalFolder) {
const globalFolder = rc.globalFolder.toString();
rc["globalFolder"] = path.join(path.dirname(src), globalFolder);
}
if (rc.yarnPath) {
rc["yarnPath"] = path.join(path.dirname(src), rc.yarnPath);
rc["yarnPath"] = path.join(path.dirname(src), rc.yarnPath.toString());
}

fs.writeFileSync(dst, yaml.dump(rc));
Expand Down
Loading