From 57e6750b465c19eeabdf78f40af148750e6ec896 Mon Sep 17 00:00:00 2001
From: "L. E. Segovia" <amy@amyspark.me>
Date: Sun, 3 Sep 2023 18:07:54 +0000
Subject: [PATCH 1/2] ci: Fix typo

---
 .github/workflows/build-macos.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 48998b0..6e38b1f 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -172,7 +172,6 @@ jobs:
           meson setup build --prefix=$HOME/.local -Dcpp_std=${{ matrix.cpp_std }} -Db_coverage=true --buildtype=debug
           meson compile -C build
           meson test -C build
-          cd build
           ninja -C build coverage-xml
       - name: Upload failure logs
         if: failure()

From b94e90ace6ce530090dd40c9dc93b6b44e1fc5df Mon Sep 17 00:00:00 2001
From: "L. E. Segovia" <amy@amyspark.me>
Date: Sun, 3 Sep 2023 18:57:25 +0000
Subject: [PATCH 2/2] ci: Decouple the installation folder from the coverage
 build

---
 .github/workflows/build-macos.yml | 38 +++++++++++++++++--------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 6e38b1f..f6d334d 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -63,29 +63,31 @@ jobs:
         run: ninja -C build
       - name: Test
         run: ninja -C build test
-      - name: Install
-        run: ninja -C build install
       - name: Run coverage build
         if: github.repository == 'dragonmux/crunch'
         # Codecov no longer parses gcov files automatically
         run: |
-          rm -rf build
-          meson setup build --prefix=$HOME/.local -Dcpp_std=${{ matrix.cpp_std }} -Db_coverage=true --buildtype=debug
-          meson compile -C build
-          meson test -C build
-          ninja -C build coverage-xml
+          meson setup buildcov --prefix=$HOME/.local -Dcpp_std=${{ matrix.cpp_std }} -Db_coverage=true --buildtype=debug
+          meson compile -C buildcov
+          meson test -C buildcov
+          ninja -C buildcov coverage-xml
       - name: Upload failure logs
         if: failure()
         uses: actions/upload-artifact@v3
         with:
           name: logs-${{ matrix.os }}-appleclang-${{ matrix.cpp_std }}
-          path: ${{ github.workspace }}/build
+          path: |
+            ${{ github.workspace }}/build
+            ${{ github.workspace }}/buildcov
           retention-days: 5
+      - name: Install
+        if: success()
+        run: ninja -C build install
       - name: Codecov
         if: success()
         uses: codecov/codecov-action@v3
         with:
-          directory: ./build/meson-logs/
+          directory: ./buildcov/meson-logs/
           files: coverage.xml
           token: ${{ secrets.CODECOV_TOKEN }}
 
@@ -162,28 +164,30 @@ jobs:
         run: ninja -C build
       - name: Test
         run: ninja -C build test
-      - name: Install
-        run: ninja -C build install
       - name: Run coverage build
         if: github.repository == 'dragonmux/crunch'
         # Codecov no longer parses gcov files automatically
         run: |
-          rm -rf build
-          meson setup build --prefix=$HOME/.local -Dcpp_std=${{ matrix.cpp_std }} -Db_coverage=true --buildtype=debug
-          meson compile -C build
+          meson setup buildcov --prefix=$HOME/.local -Dcpp_std=${{ matrix.cpp_std }} -Db_coverage=true --buildtype=debug
+          meson compile -C buildcov
           meson test -C build
-          ninja -C build coverage-xml
+          ninja -C buildcov coverage-xml
       - name: Upload failure logs
         if: failure()
         uses: actions/upload-artifact@v3
         with:
           name: logs-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.cpp_std }}
-          path: ${{ github.workspace }}/build
+          path: |
+            ${{ github.workspace }}/build
+            ${{ github.workspace }}/buildcov
           retention-days: 5
+      - name: Install
+        if: success()
+        run: ninja -C build install
       - name: Codecov
         if: success()
         uses: codecov/codecov-action@v3
         with:
-          directory: ./build/meson-logs/
+          directory: ./buildcov/meson-logs/
           files: coverage.xml
           token: ${{ secrets.CODECOV_TOKEN }}