about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJakub Beránek <berykubik@gmail.com>2024-04-19 21:41:49 +0200
committerJakub Beránek <berykubik@gmail.com>2024-04-20 09:06:04 +0200
commit9fec43ddf12118f6bfa66aedb17bca91618f153b (patch)
tree5d47291fa6d92ef68bce7fc802d7a6e8494f9e0c
parent9c7b1f4848263b7a39486a2cd482db0d632884e8 (diff)
downloadrust-9fec43ddf12118f6bfa66aedb17bca91618f153b.tar.gz
rust-9fec43ddf12118f6bfa66aedb17bca91618f153b.zip
Move calculate-job-matrix.py to `ci/github-actions`
-rw-r--r--.github/workflows/ci.yml2
-rwxr-xr-xsrc/ci/github-actions/calculate-job-matrix.py (renamed from src/ci/scripts/calculate-job-matrix.py)2
-rw-r--r--src/ci/github-actions/ci.yml2
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 90269f56c52..e01eec949a2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Checkout the source code
         uses: actions/checkout@v4
       - name: Calculate the CI job matrix
-        run: python3 src/ci/scripts/calculate-job-matrix.py >> $GITHUB_OUTPUT
+        run: python3 src/ci/github-actions/calculate-job-matrix.py >> $GITHUB_OUTPUT
         id: jobs
   pr:
     name: "PR - ${{ matrix.name }}"
diff --git a/src/ci/scripts/calculate-job-matrix.py b/src/ci/github-actions/calculate-job-matrix.py
index 9b1e74c23c3..ba40f4da847 100755
--- a/src/ci/scripts/calculate-job-matrix.py
+++ b/src/ci/github-actions/calculate-job-matrix.py
@@ -15,7 +15,7 @@ from pathlib import Path
 
 import yaml
 
-JOBS_YAML_PATH = Path(__file__).absolute().parent.parent / "github-actions" / "jobs.yml"
+JOBS_YAML_PATH = Path(__file__).absolute().parent / "jobs.yml"
 
 
 if __name__ == "__main__":
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index de71b9f874f..9d1c3284be2 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -351,7 +351,7 @@ jobs:
       - name: Checkout the source code
         uses: actions/checkout@v4
       - name: Calculate the CI job matrix
-        run: python3 src/ci/scripts/calculate-job-matrix.py >> $GITHUB_OUTPUT
+        run: python3 src/ci/github-actions/calculate-job-matrix.py >> $GITHUB_OUTPUT
         id: jobs
   pr:
     <<: *base-ci-job