From 248c51436d550ed1df1470986c444aec9b4e945d Mon Sep 17 00:00:00 2001
From: Daniel Arndt <arndtd@ornl.gov>
Date: Sun, 1 Oct 2023 12:46:48 -0400
Subject: [PATCH] GitHub CI OSX and Windows: Upload CMakeConfigureLog

---
 .github/workflows/osx.yml     | 26 ++++++--------------------
 .github/workflows/windows.yml | 13 +++----------
 2 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
index e51618c34d..9f5637077d 100644
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@@ -46,20 +46,13 @@ jobs:
       run: |
         make VERBOSE=1 -j2
         make -j3 test # quicktests
-    - name: archive error 1
+    - name: upload CMakeCongiureLog
       uses: actions/upload-artifact@v3
       if: always()
       continue-on-error: true
       with:
-        name: osx-serial-CMakeOutput.log
-        path: CMakeFiles/CMakeOutput.log
-    - name: archive error 2
-      uses: actions/upload-artifact@v3
-      if: always()
-      continue-on-error: true
-      with:
-        name: osx-serial-CMakeError.log
-        path: CMakeFiles/CMakeError.log
+        name: osx-serial-CMakeConfigureLog.yaml
+        path: CMakeFiles/CMakeConfigureLog.yaml
 
   osx-parallel64:
     # MPI build using apple clang and 64 bit indices
@@ -97,18 +90,11 @@ jobs:
       run: |
         make VERBOSE=1 -j2
         make -j3 test #quicktests
-    - name: archive error 1
-      uses: actions/upload-artifact@v3
-      if: always()
-      continue-on-error: true
-      with:
-        name: osx-parallel64-CMakeOutput.log
-        path: CMakeFiles/CMakeOutput.log
-    - name: archive error 2
+    - name: upload CMakeConfigureLog
       uses: actions/upload-artifact@v3
       if: always()
       continue-on-error: true
       with:
-        name: osx-parallel64-CMakeError.log
-        path: CMakeFiles/CMakeError.log
+        name: osx-parallel64-CMakeConfigureLog.yaml
+        path: CMakeFiles/CMakeConfigureLog.yaml
 
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 55798659db..0d36040729 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -74,17 +74,10 @@ jobs:
       with:
         name: dealii-windows.zip
         path: c:/project/dealii-windows.zip
-    - name: upload CMakeOutput
+    - name: upload CMakeConfigureLog
       uses: actions/upload-artifact@v3
       if: always()
       continue-on-error: true
       with:
-        name: windows-serial-CMakeOutput.log
-        path: build/CMakeFiles/CMakeOutput.log
-    - name: upload CMakeError
-      uses: actions/upload-artifact@v3
-      if: always()
-      continue-on-error: true
-      with:
-        name: windows-serial-CMakeError.log
-        path: build/CMakeFiles/CMakeError.log
+        name: windows-serial-CMakeConfigureLog.yaml
+        path: build/CMakeFiles/CMakeConfigureLog.yaml
-- 
2.39.5