Skip to content

Commit

Permalink
Revert PR 1985 changes to artiface@v3, etc.
Browse files Browse the repository at this point in the history
  • Loading branch information
dmurphy18 committed Jun 25, 2024
1 parent fc79848 commit 16295f0
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 18 deletions.
27 changes: 18 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/templates/ci-tail.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 14 additions & 7 deletions .github/workflows/templates/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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

0 comments on commit 16295f0

Please sign in to comment.