Skip to content

Commit e30dc12

Browse files
[NFC][Github] Move Container Composite Workflows to .github/actions (#166864)
This allows for their reuse inside llvm-zorg. Otherwise we get an error that we cannot use reusable workflows inside job steps because Github thinks that they are reuseable workflows rather than composite actions. This should be NFC inside the monorepo.
1 parent 8b42200 commit e30dc12

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

.github/workflows/build-ci-container-tooling.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ on:
1212
- '.github/workflows/containers/github-action-ci-tooling/**'
1313
- llvm/utils/git/requirements_formatting.txt
1414
- llvm/utils/git/requirements_linting.txt
15-
- '.github/workflows/build-container/**'
16-
- '.github/workflows/push-container/**'
15+
- '.github/actions/build-container/**'
16+
- '.github/actions/push-container/**'
1717
pull_request:
1818
paths:
1919
- .github/workflows/build-ci-container-tooling.yml
2020
- '.github/workflows/containers/github-action-ci-tooling/**'
2121
- llvm/utils/git/requirements_formatting.txt
2222
- llvm/utils/git/requirements_linting.txt
23-
- '.github/workflows/build-container/**'
24-
- '.github/workflows/push-container/**'
23+
- '.github/actions/build-container/**'
24+
- '.github/actions/push-container/**'
2525

2626
jobs:
2727
build-ci-container-tooling:
@@ -45,10 +45,10 @@ jobs:
4545
llvm/utils/git/requirements_formatting.txt
4646
llvm/utils/git/requirements_linting.txt
4747
clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
48-
.github/workflows/build-container
48+
.github/actions/build-container
4949
5050
- name: Build Container
51-
uses: ./.github/workflows/build-container
51+
uses: ./.github/actions/build-container
5252
with:
5353
container-name: ci-ubuntu-24.04-${{ matrix.container-name }}
5454
dockerfile: .github/workflows/containers/github-action-ci-tooling/Dockerfile
@@ -67,8 +67,8 @@ jobs:
6767
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6868
with:
6969
sparse-checkout: |
70-
.github/workflows/push-container
70+
.github/actions/push-container
7171
72-
- uses: ./.github/workflows/push-container
72+
- uses: ./.github/actions/push-container
7373
with:
7474
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-ci-container.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ on:
1010
paths:
1111
- .github/workflows/build-ci-container.yml
1212
- '.github/workflows/containers/github-action-ci/**'
13-
- '.github/workflows/build-container/**'
14-
- '.github/workflows/push-container/**'
13+
- '.github/actions/build-container/**'
14+
- '.github/actions/push-container/**'
1515
pull_request:
1616
paths:
1717
- .github/workflows/build-ci-container.yml
1818
- '.github/workflows/containers/github-action-ci/**'
19-
- '.github/workflows/build-container/**'
20-
- '.github/workflows/push-container/**'
19+
- '.github/actions/build-container/**'
20+
- '.github/actions/push-container/**'
2121

2222
jobs:
2323
build-ci-container:
@@ -40,10 +40,10 @@ jobs:
4040
with:
4141
sparse-checkout: |
4242
.github/workflows/containers/github-action-ci/
43-
.github/workflows/build-container
43+
.github/actions/build-container
4444
4545
- name: Build Container
46-
uses: ./.github/workflows/build-container
46+
uses: ./.github/actions/build-container
4747
with:
4848
container-name: ci-ubuntu-24.04${{ matrix.container-name && format('-{0}', matrix.container-name)}}
4949
context: .github/workflows/containers/github-action-ci/
@@ -65,8 +65,8 @@ jobs:
6565
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6666
with:
6767
sparse-checkout: |
68-
.github/workflows/push-container
68+
.github/actions/push-container
6969
70-
- uses: ./.github/workflows/push-container
70+
- uses: ./.github/actions/push-container
7171
with:
7272
token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)