Skip to content

Commit 9a3f603

Browse files
Bump actions/download-artifact from 5 to 6 (#4427) (#4430)
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 5 to 6. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](actions/download-artifact@v5...v6) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 1f36a18) Resolved the merge conflict by checking out the YAML file from "master" branch: $ git checkout master .github/workflows/deploy.yml (cherry picked from commit dc8a11d) Resolved the merge conflict by checking out the YAML file from "master" branch: $ git checkout master .github/workflows/deploy.yml Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 4c9be4c)
1 parent 8b0237f commit 9a3f603

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

.github/workflows/deploy.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
image: quay.io/ivanhorvath/ccutil:amazing
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v5
2626

2727
- name: Compile html-single
2828
run: make -C guides ccutil -j ${{ env.MAKE_J }}
@@ -45,7 +45,7 @@ jobs:
4545
working-directory: .
4646

4747
- name: Checkout
48-
uses: actions/checkout@v4
48+
uses: actions/checkout@v5
4949

5050
- name: Setup Ruby
5151
uses: ruby/setup-ruby@v1
@@ -102,7 +102,7 @@ jobs:
102102
working-directory: guides
103103
steps:
104104
- name: Checkout
105-
uses: actions/checkout@v4
105+
uses: actions/checkout@v5
106106
with:
107107
ref: ${{ github.base_ref }}
108108

@@ -130,11 +130,16 @@ jobs:
130130
build-web:
131131
runs-on: ubuntu-22.04
132132
steps:
133-
- name: Checkout
134-
uses: actions/checkout@v4
133+
- name: Checkout master
134+
if: github.event_name != 'pull_request' || github.base_ref != 'master'
135+
uses: actions/checkout@v5
135136
with:
136137
ref: master
137138

139+
- name: Checkout PR
140+
if: github.event_name == 'pull_request' && github.base_ref == 'master'
141+
uses: actions/checkout@v5
142+
138143
- name: Setup Ruby
139144
uses: ruby/setup-ruby@v1
140145
with:
@@ -180,13 +185,13 @@ jobs:
180185

181186
- name: Download web (only for master)
182187
if: github.ref == 'refs/heads/master'
183-
uses: actions/download-artifact@v4
188+
uses: actions/download-artifact@v6
184189
with:
185190
name: foreman-docs-web-${{ env.BRANCH_NAME }}
186191
path: public
187192

188193
- name: Download HTML
189-
uses: actions/download-artifact@v4
194+
uses: actions/download-artifact@v6
190195
with:
191196
name: foreman-docs-html-${{ env.BRANCH_NAME }}
192197
path: public/${{ env.BRANCH_NAME }}

0 commit comments

Comments
 (0)