From 48a22b17226d7fe7549e9cc983cfa8c5082aff24 Mon Sep 17 00:00:00 2001 From: David Murphy Date: Mon, 23 Sep 2024 15:36:32 -0600 Subject: [PATCH] Another attempt to resolve duplicate exitstatus detection --- .github/workflows/ci.yml | 14 ++++---------- .github/workflows/templates/ci-tail.yml | 2 +- .github/workflows/templates/ci.yml | 12 +++--------- .github/workflows/test-linux.yml | 2 +- .github/workflows/test-macos.yml | 2 +- .github/workflows/test-windows.yml | 2 +- 6 files changed, 11 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34613b591..25e683b32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,9 +50,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: exitstatus - path: exitstatus/* - retention-days: 7 - if-no-files-found: error + path: exitstatus/ generate-actions-workflow: name: Generate The Actions Workflow @@ -89,9 +87,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: exitstatus - path: exitstatus/* - retention-days: 7 - if-no-files-found: error + path: exitstatus/ lint: name: Lint @@ -116,9 +112,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: exitstatus - path: exitstatus/* - retention-days: 7 - if-no-files-found: error + path: exitstatus/ @@ -519,7 +513,7 @@ jobs: uses: actions/download-artifact@v4 with: name: exitstatus - path: exitstatus + path: exitstatus/ - name: Delete Exit Status Artifacts if: always() diff --git a/.github/workflows/templates/ci-tail.yml b/.github/workflows/templates/ci-tail.yml index 712f5169e..0a9f84ac6 100644 --- a/.github/workflows/templates/ci-tail.yml +++ b/.github/workflows/templates/ci-tail.yml @@ -14,7 +14,7 @@ uses: actions/download-artifact@v4 with: name: exitstatus - path: exitstatus + path: exitstatus/ - name: Delete Exit Status Artifacts if: always() diff --git a/.github/workflows/templates/ci.yml b/.github/workflows/templates/ci.yml index 14efc1ccf..abf154a41 100644 --- a/.github/workflows/templates/ci.yml +++ b/.github/workflows/templates/ci.yml @@ -50,9 +50,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: exitstatus - path: exitstatus/* - retention-days: 7 - if-no-files-found: error + path: exitstatus/ generate-actions-workflow: name: Generate The Actions Workflow @@ -89,9 +87,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: exitstatus - path: exitstatus/* - retention-days: 7 - if-no-files-found: error + path: exitstatus/ lint: name: Lint @@ -116,6 +112,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: exitstatus - path: exitstatus/* - retention-days: 7 - if-no-files-found: error + path: exitstatus/ diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 6b0c7a3e0..c63ede2b5 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -82,4 +82,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: exitstatus - path: exitstatus + path: exitstatus/ diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index ba5dbb74a..494c4eda9 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -89,4 +89,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: exitstatus - path: exitstatus + path: exitstatus/ diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 0d0b5b9c1..49c402950 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -118,4 +118,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: exitstatus - path: exitstatus + path: exitstatus/