Merge branch 'master' into sable

.github/workflows/test-stable.yml

@@ -454,7 +454,6 @@ jobs:
     - test-unrealircd-5
     - test-unrealircd-anope
     - test-unrealircd-atheme
-    - test-unrealircd-dlk
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
@@ -1382,52 +1381,6 @@ jobs:
       with:
         name: pytest-results_unrealircd-atheme_stable
         path: pytest.xml
-  test-unrealircd-dlk:
-    needs:
-    - build-unrealircd
-    runs-on: ubuntu-22.04
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.11
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.11
-    - name: Download build artefacts
-      uses: actions/download-artifact@v3
-      with:
-        name: installed-unrealircd
-        path: '~'
-    - name: Unpack artefacts
-      run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
-    - name: Checkout Dlk
-      uses: actions/checkout@v3
-      with:
-        path: Dlk-Services
-        ref: 6db51ea03f039c48fd20427c04cec8ff98df7878
-        repository: DalekIRC/Dalek-Services
-    - name: Build Dlk
-      run: |
-        pip install pifpaf
-        wget -q https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
-        wget -q https://wordpress.org/latest.zip -O wordpress-latest.zip
-    - name: Install system dependencies
-      run: sudo apt-get install atheme-services faketime
-    - name: Install irctest dependencies
-      run: |-
-        python -m pip install --upgrade pip
-        pip install pytest pytest-xdist -r requirements.txt
-    - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
-        IRCTEST_DLK_PATH="${{ github.workspace }}/Dlk-Services" IRCTEST_WP_CLI_PATH="${{
-        github.workspace }}/wp-cli.phar" IRCTEST_WP_ZIP_PATH="${{ github.workspace
-        }}/wordpress-latest.zip" make unrealircd-dlk
-      timeout-minutes: 30
-    - if: always()
-      name: Publish results
-      uses: actions/upload-artifact@v3
-      with:
-        name: pytest-results_unrealircd-dlk_stable
-        path: pytest.xml
 name: irctest with stable versions
 'on':
   pull_request: null

workflows.yml

@@ -365,8 +365,8 @@ software:
         separate_build_job: false
         path: Dlk-Services
         refs:
-            stable: &dlk_stable "6db51ea03f039c48fd20427c04cec8ff98df7878"
-            release: *dlk_stable
+            stable: null  # disabled because flaky, and hard to debug with all the PHP 8 warnings
+            release: &dlk_stable "6db51ea03f039c48fd20427c04cec8ff98df7878"
             devel: "main"
             devel_release: *dlk_stable
         build_script: |