Merge branch 'aucmd_textputpost' into 20230125_mix20230125_mix

3 files changed, 18 insertions, 13 deletions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b158d966e1..83ee4f0358 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -128,7 +128,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup common environment variables
-        run: ./.github/workflows/env.sh lint
+        run: ./.github/workflows/env.sh lintc
 
       - name: Install apt packages
         run: |
@@ -141,14 +141,17 @@ jobs:
             libtree-sitter-dev \
             libunibilium-dev \
             libuv1-dev \
-            libvterm-dev \
             lua-busted \
             lua-filesystem \
             lua-inspect \
             lua-lpeg \
-            lua-luv-dev \
             lua-nvim \
             luajit
+            # libvterm-dev \
+            # lua-luv-dev
+
+            # Remove comments from packages once we start using these external
+            # dependencies. See env.sh for more context.
 
       - uses: ./.github/actions/cache
 
@@ -156,7 +159,7 @@ jobs:
         run: ./ci/before_script.sh
 
       - name: Build nvim
-        run: ./ci/run_tests.sh build_nvim
+        run: make
 
       - if: "!cancelled()"
         name: Determine if run should be aborted
diff --git a/.github/workflows/env.sh b/.github/workflows/env.sh
index d93552fed3..42a355da44 100755
--- a/.github/workflows/env.sh
+++ b/.github/workflows/env.sh
@@ -26,7 +26,6 @@ BUILD_FLAGS="CMAKE_FLAGS=-DCI_BUILD=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_
 
 case "$FLAVOR" in
   asan)
-    BUILD_FLAGS="$BUILD_FLAGS -DPREFER_LUA=ON"
     cat <<EOF >> "$GITHUB_ENV"
 CLANG_SANITIZER=ASAN_UBSAN
 ASAN_OPTIONS=detect_leaks=1:check_initialization_order=1:log_path=$GITHUB_WORKSPACE/build/log/asan:intercept_tls_get_addr=0
@@ -44,13 +43,15 @@ EOF
 BUILD_UCHAR=1
 EOF
     ;;
-  lint)
+  lintc)
 # Re-enable once system deps are available
 #    BUILD_FLAGS="$BUILD_FLAGS -DLIBLUV_LIBRARY:FILEPATH=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/lua/5.1/luv.so -DLIBLUV_INCLUDE_DIR:PATH=/usr/include/lua5.1"
-    DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUV=ON"
-    cat <<EOF >> "$GITHUB_ENV"
-USE_BUNDLED=OFF
-EOF
+
+    # Ideally all dependencies should external for this job, but some
+    # dependencies don't have the required version available. We use the
+    # bundled versions for these with the hopes of being able to remove them
+    # later on.
+    DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED=OFF -DUSE_BUNDLED_LUV=ON -DUSE_BUNDLED_LIBVTERM=ON"
     ;;
   functionaltest-lua)
     BUILD_FLAGS="$BUILD_FLAGS -DPREFER_LUA=ON"
diff --git a/.github/workflows/news.yml b/.github/workflows/news.yml
index 46ac0ec02d..11807e9b42 100644
--- a/.github/workflows/news.yml
+++ b/.github/workflows/news.yml
@@ -22,9 +22,10 @@ jobs:
               {
                 echo "
                   Pull request includes a new feature or a breaking change, but
-                  news.txt hasn't been updated yet. news.txt is our primary way of
-                  communicating changes to users so it's important to keep it up to
-                  date."
+                  news.txt hasn't been updated yet. This is just a reminder
+                  that news.txt may need to be updated. You can ignore this CI
+                  failure if you think the change won't be of interest to
+                  users."
                   exit 1
                }
             fi