From 5da0d513b9ce1cc7e5458c14461ed4b0dad833da Mon Sep 17 00:00:00 2001 From: dundargoc Date: Sat, 16 Mar 2024 14:15:23 +0100 Subject: ci: update clang version to 18 This fixes the false TSAN errors in CI. --- .github/scripts/install_deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/scripts') diff --git a/.github/scripts/install_deps.sh b/.github/scripts/install_deps.sh index ad81e053f9..2b8335f192 100755 --- a/.github/scripts/install_deps.sh +++ b/.github/scripts/install_deps.sh @@ -16,7 +16,7 @@ if [[ $os == Linux ]]; then if [[ $CC == clang ]]; then DEFAULT_CLANG_VERSION=$(echo | clang -dM -E - | grep __clang_major | awk '{print $3}') - CLANG_VERSION=17 + CLANG_VERSION=18 if ((DEFAULT_CLANG_VERSION >= CLANG_VERSION)); then echo "Default clang version is $DEFAULT_CLANG_VERSION, which equal or larger than wanted version $CLANG_VERSION. Aborting!" exit 1 -- cgit From 924a7ef8bb3b74eccbffd48bc1a283d3867b8119 Mon Sep 17 00:00:00 2001 From: dundargoc Date: Fri, 15 Mar 2024 10:56:33 +0100 Subject: ci: don't assign reviewers for "api" and "ui" labels The labels as they're currently defined are too broad to meaningfully add specific reviewers for them. --- .github/scripts/reviewers_add.js | 10 ---------- 1 file changed, 10 deletions(-) (limited to '.github/scripts') diff --git a/.github/scripts/reviewers_add.js b/.github/scripts/reviewers_add.js index c6a878ec8e..d8319ea56b 100644 --- a/.github/scripts/reviewers_add.js +++ b/.github/scripts/reviewers_add.js @@ -7,11 +7,6 @@ module.exports = async ({ github, context }) => { const labels = pr_data.data.labels.map((e) => e.name); const reviewers = new Set(); - if (labels.includes("api")) { - reviewers.add("bfredl"); - reviewers.add("famiu"); - } - if (labels.includes("build")) { reviewers.add("dundargoc"); reviewers.add("jamessan"); @@ -103,11 +98,6 @@ module.exports = async ({ github, context }) => { reviewers.add("dundargoc"); } - if (labels.includes("ui")) { - reviewers.add("bfredl"); - reviewers.add("famiu"); - } - if (labels.includes("vim-patch")) { reviewers.add("seandewar"); reviewers.add("zeertzjq"); -- cgit From 036f86feaccb25d8552c4bf4d216f7f2a9205325 Mon Sep 17 00:00:00 2001 From: dundargoc Date: Sat, 23 Mar 2024 21:28:46 +0100 Subject: ci: provide separate macos releases for intel and arm This will immensely reduce the complexity required to support both architectures, reduce overall lines of code and unblock follow-up simplifications. --- .github/scripts/build_universal_macos.sh | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100755 .github/scripts/build_universal_macos.sh (limited to '.github/scripts') diff --git a/.github/scripts/build_universal_macos.sh b/.github/scripts/build_universal_macos.sh deleted file mode 100755 index aeda93ee03..0000000000 --- a/.github/scripts/build_universal_macos.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -e - -MACOSX_DEPLOYMENT_TARGET=11.0 -export MACOSX_DEPLOYMENT_TARGET -cmake -S cmake.deps -B .deps -G Ninja \ - -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ - -D CMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} \ - -D CMAKE_OSX_ARCHITECTURES=arm64\;x86_64 \ - -D CMAKE_FIND_FRAMEWORK=NEVER -cmake --build .deps -cmake -B build -G Ninja \ - -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ - -D CMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} \ - -D CMAKE_OSX_ARCHITECTURES=arm64\;x86_64 \ - -D ENABLE_LIBINTL=OFF \ - -D CMAKE_FIND_FRAMEWORK=NEVER -cmake --build build -# Make sure we build everything for M1 as well -for macho in build/bin/* build/lib/nvim/parser/*.so; do - lipo -info "$macho" | grep -q arm64 || exit 1 -done -cpack --config build/CPackConfig.cmake -- cgit From 36acb2a8ec905069e382bb3b6db6b6ac677bce39 Mon Sep 17 00:00:00 2001 From: dundargoc Date: Fri, 29 Mar 2024 13:20:43 +0100 Subject: ci: use `--break-system-packages` on mac when installing pynvim Python 3.12+ throws an error if you try to install a package in an externally managed environment. Using `--break-system-packages` is not recommended for personal use, but for CI it should be fine and is probably the most straightforward solution. --- .github/scripts/install_deps.sh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to '.github/scripts') diff --git a/.github/scripts/install_deps.sh b/.github/scripts/install_deps.sh index 2b8335f192..66f418eb10 100755 --- a/.github/scripts/install_deps.sh +++ b/.github/scripts/install_deps.sh @@ -31,11 +31,17 @@ if [[ $os == Linux ]]; then if [[ -n $TEST ]]; then sudo apt-get install -y locales-all cpanminus attr libattr1-dev gdb fswatch + + # Use default CC to avoid compilation problems when installing Python modules + CC=cc python3 -m pip -q install --user --upgrade pynvim fi elif [[ $os == Darwin ]]; then brew update --quiet brew install ninja if [[ -n $TEST ]]; then brew install cpanminus fswatch + + # Use default CC to avoid compilation problems when installing Python modules + CC=cc python3 -m pip -q install --user --upgrade --break-system-packages pynvim fi fi -- cgit From b83d5fabc6cbe08867b933958de7df7d3917247b Mon Sep 17 00:00:00 2001 From: dundargoc Date: Mon, 13 May 2024 20:11:15 +0200 Subject: ci(labeler): adjust configuration --- .github/scripts/close_unresponsive.js | 2 +- .github/scripts/labeler_configuration.yml | 64 ++++++++++++++++--------------- .github/scripts/reviewers_add.js | 19 +++++---- 3 files changed, 44 insertions(+), 41 deletions(-) (limited to '.github/scripts') diff --git a/.github/scripts/close_unresponsive.js b/.github/scripts/close_unresponsive.js index b16c19b653..5fd231423c 100644 --- a/.github/scripts/close_unresponsive.js +++ b/.github/scripts/close_unresponsive.js @@ -26,7 +26,7 @@ module.exports = async ({ github, context }) => { repo: repo, issue_number: number, }, - (response) => response.data.filter(labeledEvent) + (response) => response.data.filter(labeledEvent), ); const latest_response_label = events[events.length - 1]; diff --git a/.github/scripts/labeler_configuration.yml b/.github/scripts/labeler_configuration.yml index 3db8444fde..f3b5e0decf 100644 --- a/.github/scripts/labeler_configuration.yml +++ b/.github/scripts/labeler_configuration.yml @@ -1,71 +1,75 @@ -lsp: +build: - changed-files: - - any-glob-to-any-file: [ runtime/lua/vim/lsp.lua, runtime/lua/vim/lsp/* ] + - any-glob-to-any-file: [ CMakeLists.txt, "**/CMakeLists.txt", "**/Makefile", "**/*.cmake", cmake.deps/**/* ] -tui: +ci: - changed-files: - - any-glob-to-any-file: [ src/nvim/tui/tui.* ] + - any-glob-to-any-file: [ .github/actions/**, .github/workflows/**, .github/scripts/** ] -treesitter: +clipboard: - changed-files: - - any-glob-to-any-file: [ src/nvim/lua/treesitter.*, runtime/lua/vim/treesitter.lua, runtime/lua/vim/treesitter/*, runtime/queries/**/* ] + - any-glob-to-any-file: [ runtime/autoload/provider/clipboard.vim ] + +column: + - changed-files: + - any-glob-to-any-file: [ src/nvim/sign* ] diagnostic: - changed-files: - any-glob-to-any-file: [ runtime/lua/vim/diagnostic.lua ] -dependencies: +diff: - changed-files: - - any-glob-to-any-file: [ cmake.deps/**/* ] + - any-glob-to-any-file: [ src/nvim/diff.* ] -spell: +documentation: - changed-files: - - any-glob-to-any-file: [ src/nvim/spell* ] + - any-glob-to-all-files: [ runtime/doc/*, "**/*.md" ] -terminal: +editorconfig: - changed-files: - - any-glob-to-any-file: [ src/nvim/terminal.* ] + - any-glob-to-any-file: [ .editorconfig, runtime/lua/editorconfig.lua, runtime/plugin/editorconfig.lua ] -column: +filetype: - changed-files: - - any-glob-to-any-file: [ src/nvim/sign* ] + - any-glob-to-any-file: [ runtime/lua/vim/filetype.lua, runtime/lua/vim/filetype/detect.lua ] folds: - changed-files: - any-glob-to-any-file: [ src/nvim/fold* ] +lsp: + - changed-files: + - any-glob-to-any-file: [ runtime/lua/vim/lsp.lua, runtime/lua/vim/lsp/* ] + mouse: - changed-files: - any-glob-to-any-file: [ src/nvim/mouse* ] -documentation: +platform:nix: - changed-files: - - any-glob-to-all-files: [ runtime/doc/*, "**/*.md" ] + - any-glob-to-any-file: [ contrib/flake.lock, contrib/flake.nix ] -clipboard: +snippet: - changed-files: - - any-glob-to-any-file: [ runtime/autoload/provider/clipboard.vim ] + - any-glob-to-any-file: [ runtime/lua/vim/snippet.lua ] -diff: +spell: - changed-files: - - any-glob-to-any-file: [ src/nvim/diff.* ] + - any-glob-to-any-file: [ src/nvim/spell* ] -build: +terminal: - changed-files: - - any-glob-to-any-file: [ CMakeLists.txt, "**/CMakeLists.txt", "**/Makefile", "**/*.cmake" ] + - any-glob-to-any-file: [ src/nvim/terminal.* ] test: - changed-files: - any-glob-to-all-files: [test/**/*] -ci: - - changed-files: - - any-glob-to-any-file: [ .github/actions/**, .github/workflows/**, .github/scripts/** ] - -filetype: +treesitter: - changed-files: - - any-glob-to-any-file: [ runtime/lua/vim/filetype.lua, runtime/lua/vim/filetype/detect.lua ] + - any-glob-to-any-file: [ src/nvim/lua/treesitter.*, runtime/lua/vim/treesitter.lua, runtime/lua/vim/treesitter/*, runtime/queries/**/* ] -platform:nix: +tui: - changed-files: - - any-glob-to-any-file: [ contrib/flake.lock, contrib/flake.nix ] + - any-glob-to-any-file: [ src/nvim/tui/tui.* ] diff --git a/.github/scripts/reviewers_add.js b/.github/scripts/reviewers_add.js index d8319ea56b..a7e0d2e47b 100644 --- a/.github/scripts/reviewers_add.js +++ b/.github/scripts/reviewers_add.js @@ -27,10 +27,6 @@ module.exports = async ({ github, context }) => { reviewers.add("gpanders"); } - if (labels.includes("dependencies")) { - reviewers.add("jamessan"); - } - if (labels.includes("diagnostic")) { reviewers.add("gpanders"); } @@ -39,14 +35,14 @@ module.exports = async ({ github, context }) => { reviewers.add("lewis6991"); } - if (labels.includes("distribution")) { - reviewers.add("jamessan"); - } - if (labels.includes("documentation")) { reviewers.add("clason"); } + if (labels.includes("editorconfig")) { + reviewers.add("gpanders"); + } + if (labels.includes("extmarks")) { reviewers.add("bfredl"); } @@ -54,11 +50,9 @@ module.exports = async ({ github, context }) => { if (labels.includes("filetype")) { reviewers.add("clason"); reviewers.add("gpanders"); - reviewers.add("smjonas"); } if (labels.includes("lsp")) { - reviewers.add("folke"); reviewers.add("MariaSolOs"); reviewers.add("mfussenegger"); } @@ -76,6 +70,10 @@ module.exports = async ({ github, context }) => { reviewers.add("justinmk"); } + if (labels.includes("snippet")) { + reviewers.add("MariaSolOs"); + } + if (labels.includes("statusline")) { reviewers.add("famiu"); } @@ -88,6 +86,7 @@ module.exports = async ({ github, context }) => { reviewers.add("bfredl"); reviewers.add("clason"); reviewers.add("lewis6991"); + reviewers.add("wookayin"); } if (labels.includes("tui")) { -- cgit From 0e9c92a900435fb09440398674687e45cc802b08 Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Fri, 24 May 2024 01:08:36 +0200 Subject: build: remove nix flakes (#28863) It does not work and we don't plan on maintaining these anymore. The flake files are being moved to https://github.com/nix-community/neovim-nightly-overlay/pull/516 instead. --- .github/scripts/labeler_configuration.yml | 4 ---- 1 file changed, 4 deletions(-) (limited to '.github/scripts') diff --git a/.github/scripts/labeler_configuration.yml b/.github/scripts/labeler_configuration.yml index f3b5e0decf..ea670d1dd0 100644 --- a/.github/scripts/labeler_configuration.yml +++ b/.github/scripts/labeler_configuration.yml @@ -46,10 +46,6 @@ mouse: - changed-files: - any-glob-to-any-file: [ src/nvim/mouse* ] -platform:nix: - - changed-files: - - any-glob-to-any-file: [ contrib/flake.lock, contrib/flake.nix ] - snippet: - changed-files: - any-glob-to-any-file: [ runtime/lua/vim/snippet.lua ] -- cgit