From c7866e1e6c772a91efc9267a2ca78ca59e1fa4e4 Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Wed, 24 Jul 2024 10:12:11 +0100
Subject: [PATCH] Run irctest against Anope 2.1.

[skip alpine ci]
[skip ubuntu ci]
[skip macos ci]
[skip windows ci]
---
 .github/workflows/ci-irctest.yml | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci-irctest.yml b/.github/workflows/ci-irctest.yml
index 85d34d0f5..7ed948bfc 100644
--- a/.github/workflows/ci-irctest.yml
+++ b/.github/workflows/ci-irctest.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Run configure
-        run: ./configure --development --disable-auto-extras --prefix=$HOME/.local/
+        run: ./configure --development --disable-auto-extras --prefix=$HOME/inspircd
 
       # Speed-up build (6 min -> 5 min)
       - name: Precompile inspircd.h
@@ -36,7 +36,7 @@ jobs:
       - name: Make artifact tarball
         run: |-
           cd ~
-          tar -czf artifacts-inspircd.tar.gz .local/
+          tar -czf artifacts-inspircd.tar.gz inspircd
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
@@ -74,36 +74,28 @@ jobs:
 
       - name: Run irctest (no services)
         if: matrix.services == 'no services'
-        run: PATH=$HOME/.local/bin:$PATH make -C irctest/ inspircd
+        run: PATH=$HOME/inspircd/bin:$PATH make -C irctest inspircd
 
       - name: Checkout Anope
         if: matrix.services == 'anope'
         uses: actions/checkout@v4
         with:
           path: anope
-          ref: 2.0.15
+          ref: 2.1.7
           repository: anope/anope
 
       - name: Build and install Anope
         if: matrix.services == 'anope'
         run: |
-          cd $GITHUB_WORKSPACE/anope/
+          cd $GITHUB_WORKSPACE/anope
           sudo apt-get install ninja-build --no-install-recommends
           mkdir build && cd build
-          cmake -DCMAKE_INSTALL_PREFIX=$HOME/.local/ -DPROGRAM_NAME=anope -GNinja ..
+          cmake -DCMAKE_INSTALL_PREFIX=$HOME/anope -DPROGRAM_NAME=anope -GNinja ..
           ninja install
 
       - name: Run irctest (Anope services)
         if: matrix.services == 'anope'
-        run: PATH=$HOME/.local/bin:$PATH make -C irctest/ inspircd-anope
-
-#      - name: Install Atheme
-#        if: matrix.services == 'atheme'
-#        run: sudo apt-get install --assume-yes atheme-services
-
-#      - name: Run irctest (Atheme services)
-#        if: matrix.services == 'atheme'
-#        run: PATH=$HOME/.local/bin:$PATH make -C irctest/ inspircd-atheme
+        run: PATH=$HOME/anope/bin:$HOME/inspircd/bin:$PATH make -C irctest inspircd-anope
 
     strategy:
       fail-fast: false
@@ -111,4 +103,3 @@ jobs:
         services:
           - no services
           - anope
-#          - atheme