From 5327978fc824d799383c54b9851e56e030ccf37a Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Thu, 10 Jul 2025 21:38:40 +0000 Subject: [PATCH] [CI] Move ops container under premerge Top level directories should probably be reserved for majorish efforts. I think the ops-container definitions make a lot more sense to have under the premerge folder even if they are not perfectly aligned. --- .../workflows/build-operations-metrics-container.yml | 10 +++++----- .../ops-container/Dockerfile | 0 .../ops-container/process_llvm_commits.py | 0 .../ops-container/requirements.lock.txt | 0 .../ops-container/requirements.txt | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename {llvm-ops-metrics => premerge}/ops-container/Dockerfile (100%) rename {llvm-ops-metrics => premerge}/ops-container/process_llvm_commits.py (100%) rename {llvm-ops-metrics => premerge}/ops-container/requirements.lock.txt (100%) rename {llvm-ops-metrics => premerge}/ops-container/requirements.txt (100%) diff --git a/.github/workflows/build-operations-metrics-container.yml b/.github/workflows/build-operations-metrics-container.yml index c52d82db..cb68afbf 100644 --- a/.github/workflows/build-operations-metrics-container.yml +++ b/.github/workflows/build-operations-metrics-container.yml @@ -9,13 +9,13 @@ on: - main paths: - .github/workflows/build-operations-metrics-container.yml - - 'llvm-ops-metrics/ops-container/**' + - 'premerge/ops-container/**' pull_request: branches: - main paths: - .github/workflows/build-operations-metrics-container.yml - - 'llvm-ops-metrics/ops-container/**' + - 'premerge/ops-container/**' jobs: build-operations-metrics-container: @@ -29,7 +29,7 @@ jobs: - name: Checkout LLVM Zorg uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - sparse-checkout: llvm-ops-metrics/ops-container + sparse-checkout: premerge/ops-container - name: Write Variables id: vars run: | @@ -39,9 +39,9 @@ jobs: echo "container-name-tag=$container_name:$tag" >> $GITHUB_OUTPUT echo "container-filename=$(echo $container_name:$tag | sed -e 's/\//-/g' -e 's/:/-/g').tar" >> $GITHUB_OUTPUT - name: Build Container - working-directory: ./llvm-ops-metrics/ops-container + working-directory: premerge/ops-container run: | - podman build -t ${{ steps.vars.outputs.container-name-tag }} -f Dockerfile . + podman build -t ${{ steps.vars.outputs.container-name-tag }} . # Save the container so we have it in case the push fails. This also # allows us to separate the push step into a different job so we can # maintain minimal permissions while building the container. diff --git a/llvm-ops-metrics/ops-container/Dockerfile b/premerge/ops-container/Dockerfile similarity index 100% rename from llvm-ops-metrics/ops-container/Dockerfile rename to premerge/ops-container/Dockerfile diff --git a/llvm-ops-metrics/ops-container/process_llvm_commits.py b/premerge/ops-container/process_llvm_commits.py similarity index 100% rename from llvm-ops-metrics/ops-container/process_llvm_commits.py rename to premerge/ops-container/process_llvm_commits.py diff --git a/llvm-ops-metrics/ops-container/requirements.lock.txt b/premerge/ops-container/requirements.lock.txt similarity index 100% rename from llvm-ops-metrics/ops-container/requirements.lock.txt rename to premerge/ops-container/requirements.lock.txt diff --git a/llvm-ops-metrics/ops-container/requirements.txt b/premerge/ops-container/requirements.txt similarity index 100% rename from llvm-ops-metrics/ops-container/requirements.txt rename to premerge/ops-container/requirements.txt