Skip to content

Commit

Permalink
Further action updates
Browse files Browse the repository at this point in the history
  • Loading branch information
dmurphy18 committed Sep 23, 2024
1 parent 8d0aca6 commit b2a3808
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- uses: actions/checkout@v4

- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ jobs:
path: |
.cut_release_version
.cut_release_changes
include-hidden-files: true

merge-develop-into-stable:
name: Merge develop into stable
Expand Down Expand Up @@ -259,6 +260,7 @@ jobs:
ref: stable
repository: ${{ github.repository }}
ssh-key: ${{ secrets.SALT_BOOTSTRAP_RELEASE_KEY }}

- name: Download Release Details
uses: actions/download-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/templates/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- uses: actions/checkout@v4

- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
bundler-cache: true

- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"

Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
- name: Upload Exit Status
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: exitstatus
path: exitstatus
4 changes: 2 additions & 2 deletions .github/workflows/test-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
bundler-cache: true

- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"

Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
- name: Upload Exit Status
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: exitstatus
path: exitstatus
6 changes: 3 additions & 3 deletions .github/workflows/test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
instance: ${{ fromJSON(inputs.instances) }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Ruby
uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
env
- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"

Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
- name: Upload Exit Status
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: exitstatus
path: exitstatus

0 comments on commit b2a3808

Please sign in to comment.