Merge branch '2.0' into 2.1.

.github/workflows/ci-linux.yml

@@ -1,15 +1,17 @@
-name: Linux CI
+name: Ubuntu CI
 on:
   - pull_request
   - push
 jobs:
   build:
+    if: "!contains(github.event.head_commit.message, '[skip ubuntu ci]')"
     runs-on: ubuntu-20.04
     env:
       CXX: ${{ matrix.compiler }}
       CXXFLAGS: -Werror
     steps:
       - uses: actions/checkout@v4
+
       - name: Install dependencies
         run: |
           sudo apt-get update --assume-yes
@@ -26,19 +28,23 @@ jobs:
             libssl-dev \
             libtre-dev \
             ninja-build
+
       - name: Enable extras
         run: |
           for MODULE in ldap ldap_authentication ldap_oper mysql regex_pcre2 regex_posix regex_tre sql_authentication sql_log sql_oper sqlite ssl_gnutls ssl_openssl
           do
             ln -s ${{ github.workspace }}/modules/extra/$MODULE.cpp ${{ github.workspace }}/modules
           done
+
       - name: Run CMake
         run: |
           mkdir build && cd build
           cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=DEBUG -DINSTDIR:STRING=${{ github.workspace }}/run ..
+
       - name: Build Anope
         run: |
           ninja -C ${{ github.workspace }}/build install
+
     strategy:
       fail-fast: false
       matrix:

.github/workflows/ci-windows.yml

@@ -6,6 +6,7 @@ on:
     - cron: '0 0 * * 0'
 jobs:
   build:
+    if: "!contains(github.event.head_commit.message, '[skip windows ci]')"
     runs-on: windows-2019
     steps:
       - uses: actions/checkout@v3