From 3f5334ee45b9ad7f9263381575ac7bd7c8f0f69b Mon Sep 17 00:00:00 2001
From: Tim Janik <timj@gnu.org>
Date: Sat, 9 Sep 2023 02:44:06 +0200
Subject: [PATCH] GITHUB: workflows/testing.yml: use cirun.sh for all CI jobs

Signed-off-by: Tim Janik <timj@gnu.org>
---
 .github/workflows/testing.yml | 64 +++++++----------------------------
 1 file changed, 12 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 732a7411..a543fa2c 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -12,6 +12,7 @@ jobs:
 
   Focal-CI:
     runs-on: ubuntu-latest
+    env: { CITAG: cifocal:latest }
     steps:
     # Checkout and fix actions/checkout messing up annotation of the fetched tag: actions/checkout#290
     - uses: actions/checkout@v4
@@ -28,10 +29,10 @@ jobs:
         cache-from: type=gha
         cache-to:   type=gha,mode=max
         load: true
-    # Run CI Stages
-    - name: Run CI Stages
+    # Build Assets
+    - name: Build Assets
       run: |
-        time misc/cirun.sh --check --assets --x11
+        time misc/cirun.sh --check --assets
     - uses: actions/upload-artifact@v3
       if: success()
       with: { name: docs, path: out/anklang-docs/ }
@@ -47,8 +48,7 @@ jobs:
 
   Arch-Replay:
     runs-on: ubuntu-latest
-    env: # INTERACTIVE: docker run -i --cap-add SYS_PTRACE -v $PWD:/anklang ...
-      RUN: docker run -v /home/runner/work/anklang/anklang:/anklang -w /anklang/ -t --rm ciarch
+    env: { CITAG: ciarch:latest }
     steps:
     # Checkout and fix actions/checkout messing up annotation of the fetched tag: actions/checkout#290
     - uses: actions/checkout@v4
@@ -65,39 +65,20 @@ jobs:
         cache-from: type=gha
         cache-to:   type=gha,mode=max
         load: true
-    # Configure Build
-    - name: Configure Build
+    # Run X11 GUI Tests
+    - name: Run X11 GUI Tests
       run: |
-        git describe
-        misc/version.sh
-        echo 'prefix=/'		>  config-defaults.mk
-        cat config-defaults.mk
-        $RUN sudo chown builder:builder -R /anklang/	# gh-runner $UID != 1000
-        $RUN misc/version.sh
-    # Build binaries and check
-    - name: Make all check
-      run: |
-        $RUN make -j`nproc` all
-        $RUN make check
-    # Run X11 GUI tests
-    - name: Make x11test
-      run: |
-        $RUN make x11test-v
+        time misc/cirun.sh --check --x11
     # Artifact upload from x11test
     - uses: actions/upload-artifact@v3
       if: always()
       with:
         name: x11test
         path: out/x11test/
-    # Restore gh-runner $UID
-    - name: Cleanup
-      run: |
-        $RUN sudo chown `id -u`:`id -g` -R /anklang/
 
   Lunar-Clang-Tidy:
     runs-on: ubuntu-latest
-    env: # INTERACTIVE: docker run -i --cap-add SYS_PTRACE -v $PWD:/anklang ...
-      RUN: docker run -v /home/runner/work/anklang/anklang:/anklang -w /anklang/ -t --rm cilunar
+    env: { CITAG: cilunar:latest }
     steps:
     # Checkout and fix actions/checkout messing up annotation of the fetched tag: actions/checkout#290
     - uses: actions/checkout@v4
@@ -114,37 +95,16 @@ jobs:
         cache-from: type=gha
         cache-to:   type=gha,mode=max
         load: true
-    # Configure Build
-    - name: Configure Build
+    # Build and Run Clang-Tidy
+    - name: Build and Run Clang-Tidy
       run: |
-        git describe
-        misc/version.sh
-        echo 'prefix=/'			>  config-defaults.mk
-        echo 'CC=clang-17'		>> config-defaults.mk
-        echo 'CXX=clang++-17'		>> config-defaults.mk
-        echo 'CLANG_TIDY=clang-tidy-17'	>> config-defaults.mk
-        cat config-defaults.mk
-        cat config-defaults.mk
-        $RUN sudo chown ubuntu:ubuntu -R /anklang/	# gh-runner $UID != 1000
-        $RUN misc/version.sh
-    # Build binaries, docs and check
-    - name: Make all check
-      run: |
-        $RUN make -j`nproc` all
-        $RUN make check
-    - name: Make clang-tidy
-      run: |
-        $RUN make -j`nproc` clang-tidy
+        time misc/cirun.sh --check --clang-tidy
     # Artifact upload from clang-tidy
     - uses: actions/upload-artifact@v3
       if: success()
       with:
         name: clang-tidy
         path: out/clang-tidy/
-    # Restore gh-runner $UID
-    - name: Cleanup
-      run: |
-        $RUN sudo chown `id -u`:`id -g` -R /anklang/
 
   Ping-IRC:
     if: always()