From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Fri, 30 Apr 2021 01:02:34 +0000 (-0700)
Subject: Create temporary files in CTest's Testing/Temporary directory and upload all files... 
X-Git-Tag: 2.0.3~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c549c4c55b3287f91d1b21d6002f853340bbd220;p=thirdparty%2Fzlib-ng.git

Create temporary files in CTest's Testing/Temporary directory and upload all files as artifacts.
---

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 8178e2a1..6ab72297 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -441,9 +441,5 @@ jobs:
         path: |
           ${{ matrix.build-dir || '.' }}/CMakeFiles/CMakeOutput.log
           ${{ matrix.build-dir || '.' }}/CMakeFiles/CMakeError.log
-          ${{ matrix.build-dir || '.' }}/Testing/Temporary/*.log
-          ${{ matrix.build-dir || '.' }}/test/**/*.diff
-          ${{ matrix.build-dir || '.' }}/test/**/*.hex
-          ${{ matrix.build-dir || '.' }}/test/**/*.gz*
-          ${{ matrix.build-dir || '.' }}/test/**/*.out
+          ${{ matrix.build-dir || '.' }}/Testing/Temporary/*
         retention-days: 30
diff --git a/cmake/test-compress.cmake b/cmake/test-compress.cmake
index 97c387da..1ec1b27e 100644
--- a/cmake/test-compress.cmake
+++ b/cmake/test-compress.cmake
@@ -58,7 +58,7 @@ endif()
 # Generate unique output path so multiple tests can be executed at the same time
 string(RANDOM LENGTH 6 UNIQUE_ID)
 string(REPLACE "." "-" TEST_NAME "${TEST_NAME}")
-set(OUTPUT_BASE "${CMAKE_CURRENT_BINARY_DIR}/test/${TEST_NAME}-${UNIQUE_ID}")
+set(OUTPUT_BASE "${CMAKE_CURRENT_BINARY_DIR}/Testing/Temporary/${TEST_NAME}-${UNIQUE_ID}")
 
 # Ensure directory exists for output files
 get_filename_component(OUTPUT_DIR "${OUTPUT_BASE}" DIRECTORY)