From b78363e6757e43b476c9e13b7c010fc9ec3ae8b6 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Thu, 6 Nov 2025 22:28:13 +0000 Subject: [PATCH 1/2] [NFC][Github] Move Container Composite Workflows to .github/actions 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. --- .github/{workflows => actions}/build-container/action.yml | 0 .github/{workflows => actions}/push-container/action.yml | 0 .github/workflows/build-ci-container-tooling.yml | 8 ++++---- .github/workflows/build-ci-container.yml | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) rename .github/{workflows => actions}/build-container/action.yml (100%) rename .github/{workflows => actions}/push-container/action.yml (100%) diff --git a/.github/workflows/build-container/action.yml b/.github/actions/build-container/action.yml similarity index 100% rename from .github/workflows/build-container/action.yml rename to .github/actions/build-container/action.yml diff --git a/.github/workflows/push-container/action.yml b/.github/actions/push-container/action.yml similarity index 100% rename from .github/workflows/push-container/action.yml rename to .github/actions/push-container/action.yml diff --git a/.github/workflows/build-ci-container-tooling.yml b/.github/workflows/build-ci-container-tooling.yml index 46dc38fe600a3..de32e1f9c5a8c 100644 --- a/.github/workflows/build-ci-container-tooling.yml +++ b/.github/workflows/build-ci-container-tooling.yml @@ -12,16 +12,16 @@ on: - '.github/workflows/containers/github-action-ci-tooling/**' - llvm/utils/git/requirements_formatting.txt - llvm/utils/git/requirements_linting.txt - - '.github/workflows/build-container/**' - - '.github/workflows/push-container/**' + - '.github/actions/build-container/**' + - '.github/actions/push-container/**' pull_request: paths: - .github/workflows/build-ci-container-tooling.yml - '.github/workflows/containers/github-action-ci-tooling/**' - llvm/utils/git/requirements_formatting.txt - llvm/utils/git/requirements_linting.txt - - '.github/workflows/build-container/**' - - '.github/workflows/push-container/**' + - '.github/actions/build-container/**' + - '.github/actions/push-container/**' jobs: build-ci-container-tooling: diff --git a/.github/workflows/build-ci-container.yml b/.github/workflows/build-ci-container.yml index 33b4dda2b2980..382d384d7ed3e 100644 --- a/.github/workflows/build-ci-container.yml +++ b/.github/workflows/build-ci-container.yml @@ -10,14 +10,14 @@ on: paths: - .github/workflows/build-ci-container.yml - '.github/workflows/containers/github-action-ci/**' - - '.github/workflows/build-container/**' - - '.github/workflows/push-container/**' + - '.github/actions/build-container/**' + - '.github/actions/push-container/**' pull_request: paths: - .github/workflows/build-ci-container.yml - '.github/workflows/containers/github-action-ci/**' - - '.github/workflows/build-container/**' - - '.github/workflows/push-container/**' + - '.github/actions/build-container/**' + - '.github/actions/push-container/**' jobs: build-ci-container: From 883aa1207e0319362f9b9907158520d28f45fb72 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Thu, 6 Nov 2025 22:38:42 +0000 Subject: [PATCH 2/2] finish --- .github/workflows/build-ci-container-tooling.yml | 8 ++++---- .github/workflows/build-ci-container.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-ci-container-tooling.yml b/.github/workflows/build-ci-container-tooling.yml index de32e1f9c5a8c..0bb8242eb35a9 100644 --- a/.github/workflows/build-ci-container-tooling.yml +++ b/.github/workflows/build-ci-container-tooling.yml @@ -45,10 +45,10 @@ jobs: llvm/utils/git/requirements_formatting.txt llvm/utils/git/requirements_linting.txt clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py - .github/workflows/build-container + .github/actions/build-container - name: Build Container - uses: ./.github/workflows/build-container + uses: ./.github/actions/build-container with: container-name: ci-ubuntu-24.04-${{ matrix.container-name }} dockerfile: .github/workflows/containers/github-action-ci-tooling/Dockerfile @@ -67,8 +67,8 @@ jobs: uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: sparse-checkout: | - .github/workflows/push-container + .github/actions/push-container - - uses: ./.github/workflows/push-container + - uses: ./.github/actions/push-container with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/build-ci-container.yml b/.github/workflows/build-ci-container.yml index 382d384d7ed3e..ddb803fb969ff 100644 --- a/.github/workflows/build-ci-container.yml +++ b/.github/workflows/build-ci-container.yml @@ -40,10 +40,10 @@ jobs: with: sparse-checkout: | .github/workflows/containers/github-action-ci/ - .github/workflows/build-container + .github/actions/build-container - name: Build Container - uses: ./.github/workflows/build-container + uses: ./.github/actions/build-container with: container-name: ci-ubuntu-24.04${{ matrix.container-name && format('-{0}', matrix.container-name)}} context: .github/workflows/containers/github-action-ci/ @@ -65,8 +65,8 @@ jobs: uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: sparse-checkout: | - .github/workflows/push-container + .github/actions/push-container - - uses: ./.github/workflows/push-container + - uses: ./.github/actions/push-container with: token: ${{ secrets.GITHUB_TOKEN }}