pass build env through

pytorch · May 5, 2023 · 0e582b3 · 0e582b3
1 parent d671cef
commit 0e582b3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/.github/actions/pytest-cache-download/action.yml b/.github/actions/pytest-cache-download/action.yml
@@ -6,6 +6,9 @@ inputs:
   cache_dir:
     description: Path to the pytest cache directory, relative to $GITHUB_WORKSPACE. This is where the merged cache will be placed.
     required: true
+  build_environment:
+    description: The build environment
+    required: true
   github-token:
     description: GITHUB_TOKEN
     required: true
@@ -30,17 +33,15 @@ runs:
       shell: bash
       env:
         CACHE_DIR: ${{ inputs.cache_dir }}
-        WORKFLOW: ${{ github.workflow }}
-        JOB: ${{ github.job }}
+        JOB_IDENTIFIER: ${{ github.workflow}_${{ github.job }}_${{ inputs.build_environment }}
         SHARD: ${{ inputs.shard }}
       run: |
         set +x
 
         echo "all the commands sent to the below script:"
         echo "cache_dir: $GITHUB_WORKSPACE/$CACHE_DIR"
         echo "pr_identifier: $GITHUB_REF"
-        echo "workflow: $WORKFLOW"
-        echo "job: $JOB"
+        echo "JOB_IDENTIFIER: $JOB_IDENTIFIER"
         echo "shard: $SHARD"
         echo "temp_dir: $RUNNER_TEMP"
 
@@ -49,6 +50,5 @@ runs:
           --download \
           --cache_dir $GITHUB_WORKSPACE/$CACHE_DIR \
           --pr_identifier $GITHUB_REF \
-          --workflow $WORKFLOW \
-          --job $JOB \
+          --job_identifier $JOB_IDENTIFIER \
           --temp_dir $RUNNER_TEMP \
diff --git a/.github/actions/pytest-cache-upload/action.yml b/.github/actions/pytest-cache-upload/action.yml
@@ -10,6 +10,9 @@ inputs:
     description: Shard number for the current job
     required: false
     default: "0"
+  build_environment:
+    description: The build environment
+    required: true
   github-token:
     description: GITHUB_TOKEN
     required: true
@@ -34,25 +37,22 @@ runs:
       shell: bash
       env:
         CACHE_DIR: ${{ inputs.cache_dir }}
-        WORKFLOW: ${{ github.workflow }}
-        JOB: ${{ github.job }}
+        JOB_IDENTIFIER: ${{ github.workflow}_${{ github.job }}_${{ inputs.build_environment }}
         SHARD: ${{ inputs.shard }}
       run: |
         set -x
 
         echo "all the commands sent to the below script:"
         echo "cache_dir: $GITHUB_WORKSPACE/$CACHE_DIR"
         echo "pr_identifier: $GITHUB_REF"
-        echo "workflow: $WORKFLOW"
-        echo "job: $JOB"
+        echo "JOB_IDENTIFIER: $JOB_IDENTIFIER"
         echo "shard: $SHARD"
         echo "temp_dir: $RUNNER_TEMP"
 
         python3 .github/scripts/pytest_cache.py \
           --upload \
           --cache_dir $GITHUB_WORKSPACE/$CACHE_DIR \
           --pr_identifier $GITHUB_REF \
-          --workflow $WORKFLOW \
-          --job $JOB \
+          --job_identifier $JOB_IDENTIFIER \
           --shard $SHARD \
           --temp_dir $RUNNER_TEMP \
diff --git a/.github/workflows/_linux-build.yml b/.github/workflows/_linux-build.yml
@@ -117,6 +117,7 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           cache_dir: .pytest_cache
+          build_environment: ${{ inputs.build-environment }}
 
       # Apply the filter logic to the build step too if the test-config label is already there
       - name: Select all requested test configurations (if the test matrix is available)

diff --git a/.github/workflows/_linux-test.yml b/.github/workflows/_linux-test.yml
@@ -120,6 +120,7 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           cache_dir: .pytest_cache
+          build_environment: ${{ inputs.build-environment }}
 
       - name: Set Test step time
         id: test-timeout
@@ -236,6 +237,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           cache_dir: .pytest_cache
           shard: ${{ matrix.shard }}
+          build_environment: ${{ inputs.build-environment }}
 
       - name: Print remaining test logs
         shell: bash