From dab4b34561c08bdbf4317fbcd0dc752d7786eb66 Mon Sep 17 00:00:00 2001
From: Ricardo Signes <rjbs@semiotic.systems>
Date: Wed, 8 Jan 2025 20:02:13 -0500
Subject: [PATCH] GitHub Action: rework the workflow to use cyd to abstract
 steps

---
 .github/workflows/main.yml | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 67432f8e83..31c73d3609 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,6 +12,10 @@ on:
       - master
       - main
       - 'cyrus-imapd-*'
+
+env:
+  CYRUS_CLONE_ROOT: ${{ github.workspace }}
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -22,15 +26,11 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: install missing or frequently-updated deps
-      shell: bash
-      run: |
-        cpanm Mail::IMAPTalk # in image, but fetch latest!
     - name: setup git safe directory
       shell: bash
       run: git config --global --add safe.directory /__w/cyrus-imapd/cyrus-imapd
     - name: fetch upstream release tags
-      if: ${{ github.repository != 'cyrusimap/cyrus-imapd' }}
+      # if: ${{ github.repository != 'cyrusimap/cyrus-imapd' }}
       shell: bash
       run: |
         git remote add upstream https://github.com/cyrusimap/cyrus-imapd.git
@@ -40,9 +40,7 @@ jobs:
         git fetch --no-tags upstream 'refs/tags/cyrus-imapd-*:refs/tags/cyrus-imapd-*'
     - name: configure and build
       shell: bash
-      run: |
-        echo "building cyrus version" $(./tools/git-version.sh)
-        ./tools/build-with-cyruslibs.sh
+      run: cyd build
     - name: report version information
       shell: bash
       run: |
@@ -50,22 +48,14 @@ jobs:
         echo "Mail::IMAPTalk" $(cpanm --info Mail::IMAPTalk)
         /usr/cyrus/libexec/master -V
         /usr/cyrus/sbin/cyr_buildinfo
-    - name: set up cassandane
-      working-directory: cassandane
-      shell: bash
-      run: |
-        cp -af cassandane.ini.dockertests cassandane.ini
-        chown cyrus:mail cassandane.ini
-        make -j8
     - name: run cassandane quietly
       id: cass1
       continue-on-error: true
-      working-directory: cassandane
-      run: setpriv --reuid=cyrus --regid=mail --clear-groups --inh-caps='-chown,-dac_override,-dac_read_search,-fowner,-fsetid,-kill,-setgid,-setuid,-setpcap,-linux_immutable,-net_bind_service,-net_broadcast,-net_admin,-net_raw,-ipc_lock,-ipc_owner,-sys_module,-sys_rawio,-sys_chroot,-sys_ptrace,-sys_pacct,-sys_admin,-sys_boot,-sys_nice,-sys_resource,-sys_time,-sys_tty_config,-mknod,-lease,-audit_write,-audit_control,-setfcap,-mac_override,-mac_admin,-syslog,-wake_alarm,-block_suspend,-audit_read,-cap_38,-cap_39,-cap_40' ./testrunner.pl --slow -f prettier -j 8 !Test::Core
+      # We haven't figured out how to make Test::Core work in actions yet.
+      run: cyd test "!Test::Core"
     - name: rerun cassandane failures noisily
       if: ${{ steps.cass1.outcome == 'failure' }}
-      working-directory: cassandane
-      run: setpriv --reuid=cyrus --regid=mail --clear-groups --inh-caps='-chown,-dac_override,-dac_read_search,-fowner,-fsetid,-kill,-setgid,-setuid,-setpcap,-linux_immutable,-net_bind_service,-net_broadcast,-net_admin,-net_raw,-ipc_lock,-ipc_owner,-sys_module,-sys_rawio,-sys_chroot,-sys_ptrace,-sys_pacct,-sys_admin,-sys_boot,-sys_nice,-sys_resource,-sys_time,-sys_tty_config,-mknod,-lease,-audit_write,-audit_control,-setfcap,-mac_override,-mac_admin,-syslog,-wake_alarm,-block_suspend,-audit_read,-cap_38,-cap_39,-cap_40' ./testrunner.pl -f pretty -j 8 --rerun
+      run: cyd test --no-slow --format pretty --rerun
     - name: collect logs
       if: always()
       run: cat /tmp/cass/*/conf/log/syslog