From 16295f03fc32eef2103fa6df881d61fcc0f3bdd8 Mon Sep 17 00:00:00 2001 From: David Murphy Date: Tue, 25 Jun 2024 13:54:09 -0600 Subject: [PATCH] Revert PR 1985 changes to artiface@v3, etc. --- .github/workflows/ci.yml | 27 ++++++++++++++++--------- .github/workflows/templates/ci-tail.yml | 6 ++++-- .github/workflows/templates/ci.yml | 21 ++++++++++++------- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 73ae83993..6f6c6bcd3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,13 +16,15 @@ jobs: outputs: run-tests: ${{ steps.set-output.outputs.run-tests }} steps: - - uses: actions/checkout@v4 + ## DGM - uses: actions/checkout@v4 + - uses: actions/checkout@v3 with: fetch-depth: 0 - name: Get specific changed files id: changed-files - uses: tj-actions/changed-files@v42 + ## DGM uses: tj-actions/changed-files@v42 + uses: tj-actions/changed-files@v25 with: separator: "," files: | @@ -47,7 +49,8 @@ jobs: - name: Upload Exit Status if: always() - uses: actions/upload-artifact@v4 + ## DGM uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: exitstatus path: exitstatus @@ -59,7 +62,8 @@ jobs: if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' steps: - - uses: actions/checkout@v4 + ## DGM - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Set up Python 3.9 uses: actions/setup-python@v4 @@ -84,7 +88,8 @@ jobs: - name: Upload Exit Status if: always() - uses: actions/upload-artifact@v4 + ## DGM uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: exitstatus path: exitstatus @@ -96,7 +101,8 @@ jobs: container: koalaman/shellcheck-alpine:v0.7.0 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' steps: - - uses: actions/checkout@v4 + ## DGM - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: ShellCheck run: | shellcheck -s sh -f tty bootstrap-salt.sh @@ -109,7 +115,8 @@ jobs: - name: Upload Exit Status if: always() - uses: actions/upload-artifact@v4 + ## DGM uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: exitstatus path: exitstatus @@ -555,14 +562,16 @@ jobs: - name: Download Exit Status Files if: always() - uses: actions/download-artifact@v4 + ## DGM uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: name: exitstatus path: exitstatus - name: Delete Exit Status Artifacts if: always() - uses: geekyeggo/delete-artifact@v4 + ## DGM uses: geekyeggo/delete-artifact@v4 + uses: geekyeggo/delete-artifact@v3 with: name: exitstatus failOnError: false diff --git a/.github/workflows/templates/ci-tail.yml b/.github/workflows/templates/ci-tail.yml index da692ed87..2314089f1 100644 --- a/.github/workflows/templates/ci-tail.yml +++ b/.github/workflows/templates/ci-tail.yml @@ -11,14 +11,16 @@ - name: Download Exit Status Files if: always() - uses: actions/download-artifact@v4 + ## DGM uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: name: exitstatus path: exitstatus - name: Delete Exit Status Artifacts if: always() - uses: geekyeggo/delete-artifact@v4 + ## DGM uses: geekyeggo/delete-artifact@v4 + uses: geekyeggo/delete-artifact@v3 with: name: exitstatus failOnError: false diff --git a/.github/workflows/templates/ci.yml b/.github/workflows/templates/ci.yml index 2bde2308b..8788ce7ac 100644 --- a/.github/workflows/templates/ci.yml +++ b/.github/workflows/templates/ci.yml @@ -16,13 +16,15 @@ jobs: outputs: run-tests: ${{ steps.set-output.outputs.run-tests }} steps: - - uses: actions/checkout@v4 + ## DGM - uses: actions/checkout@v4 + - uses: actions/checkout@v3 with: fetch-depth: 0 - name: Get specific changed files id: changed-files - uses: tj-actions/changed-files@v42 + ## DGM uses: tj-actions/changed-files@v42 + uses: tj-actions/changed-files@v25 with: separator: "," files: | @@ -47,7 +49,8 @@ jobs: - name: Upload Exit Status if: always() - uses: actions/upload-artifact@v4 + ## DGM uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: exitstatus path: exitstatus @@ -59,7 +62,8 @@ jobs: if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' steps: - - uses: actions/checkout@v4 + ## DGM - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Set up Python 3.9 uses: actions/setup-python@v4 @@ -84,7 +88,8 @@ jobs: - name: Upload Exit Status if: always() - uses: actions/upload-artifact@v4 + ## DGM uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: exitstatus path: exitstatus @@ -96,7 +101,8 @@ jobs: container: koalaman/shellcheck-alpine:v0.7.0 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' steps: - - uses: actions/checkout@v4 + ## DGM - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: ShellCheck run: | shellcheck -s sh -f tty bootstrap-salt.sh @@ -109,7 +115,8 @@ jobs: - name: Upload Exit Status if: always() - uses: actions/upload-artifact@v4 + ## DGM uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: exitstatus path: exitstatus