Skip to content

Commit ae2984b

Browse files
committed
[CIR][Github] Update docs.yaml after bad merge during rebase
1 parent e33f721 commit ae2984b

File tree

1 file changed

+6
-25
lines changed

1 file changed

+6
-25
lines changed

.github/workflows/docs.yml

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,16 @@ on:
5151
jobs:
5252
check-docs-build:
5353
name: "Test documentation build"
54-
runs-on: ubuntu-latest
54+
runs-on: ubuntu-24.04
5555
if: github.repository == 'llvm/llvm-project'
5656
steps:
57-
# Don't fetch before checking for file changes to force the file changes
58-
# action to use the Github API in pull requests. If it's a push to a
59-
# branch we can't use the Github API to get the diff, so we need to have
60-
# a local checkout beforehand.
61-
- name: Fetch LLVM sources (Push)
62-
if: ${{ github.event_name == 'push' }}
63-
uses: actions/[email protected]
57+
- name: Fetch LLVM sources
58+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6459
with:
6560
fetch-depth: 2
6661
- name: Get subprojects that have doc changes
6762
id: docs-changed-subprojects
68-
uses: step-security/changed-files@95b56dadb92a30ca9036f16423fd3c088a71ee94
63+
uses: step-security/changed-files@3dbe17c78367e7d60f00d78ae6781a35be47b4a1 # v45.0.1
6964
with:
7065
skip_initial_fetch: true
7166
base_sha: 'HEAD~1'
@@ -99,22 +94,8 @@ jobs:
9994
- 'flang/include/flang/Optimizer/Dialect/FIROps.td'
10095
workflow:
10196
- '.github/workflows/docs.yml'
102-
<<<<<<< HEAD
103-
||||||| parent of 49be891dc52b (Drop use of comprimised action)
104-
- name: Fetch LLVM sources (PR)
105-
if: ${{ github.event_name == 'pull_request' }}
106-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
107-
with:
108-
fetch-depth: 1
109-
=======
110-
- name: Fetch LLVM sources (PR)
111-
if: ${{ github.event_name == 'pull_request' }}
112-
uses: actions/[email protected]
113-
with:
114-
fetch-depth: 1
115-
>>>>>>> 49be891dc52b (Drop use of comprimised action)
11697
- name: Setup Python env
117-
uses: actions/setup-python@v5
98+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
11899
with:
119100
python-version: '3.11'
120101
cache: 'pip'
@@ -228,7 +209,7 @@ jobs:
228209
mkdir built-docs/flang
229210
cp -r flang-build/docs/* built-docs/flang/
230211
- name: Upload docs
231-
uses: actions/[email protected].2
212+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
232213
with:
233214
name: docs-output
234215
path: built-docs/

0 commit comments

Comments
 (0)