combine workflows

huggingface · Feb 27, 2024 · ae6ffb0 · ae6ffb0
1 parent 0e5bccb
commit ae6ffb0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -15,22 +15,20 @@ on:
 jobs:
   build-push-image:
     uses: ./.github/workflows/build_push_image.yml
+    secrets: inherit
     with:
       region: us-central1
       dockerfile_path: ${{ inputs.dockerfile_path }}
       docker_image_tag: ${{ inputs.docker_image_tag }}
       gcp_artifact_registry_repository: deep-learning-images
       GCP_PROJECT_ID: ${{ vars.GCP_PROJECT_ID }}
-    secrets:
-      GCP_SERVICE_ACCOUNT_JSON_KEY: ${{ secrets.GCP_SERVICE_ACCOUNT_JSON_KEY }}
 
   model_test:
     needs: build-push-image
     uses: ./.github/workflows/test_model.yml
+    secrets: inherit
     with:
       region: us-central1
       docker_image_tag: ${{ inputs.docker_image_tag }}
       gcp_artifact_registry_repository: deep-learning-images
       GCP_PROJECT_ID: ${{ vars.GCP_PROJECT_ID }}
-    secrets:
-      GCP_SERVICE_ACCOUNT_JSON_KEY: ${{ secrets.GCP_SERVICE_ACCOUNT_JSON_KEY }}
diff --git a/.github/workflows/build_push_image.yml b/.github/workflows/build_push_image.yml
@@ -23,10 +23,6 @@ on:
         description: 'GCP Project ID'
         type: string
         required: true
-    secrets:
-      GCP_SERVICE_ACCOUNT_JSON_KEY:
-        description: 'Service Account'
-        required: true
 
 jobs:
     build-push-image:

diff --git a/.github/workflows/run_build_and_test.yml b/.github/workflows/run_build_and_test.yml
@@ -8,6 +8,7 @@ on:
 jobs:
   build-push-image:
     uses: ./.github/workflows/build_and_test.yml
+    secrets: inherit
     with:
       dockerfile_path: ./containers/pytorch/training/gpu/2.1/transformers/4.38.1/py310/Dockerfile
       docker_image_tag: huggingface-pytorch-training-gpu-2.1.transformers.4.38.1.py310:latest
diff --git a/.github/workflows/test_model.yml b/.github/workflows/test_model.yml
@@ -19,10 +19,6 @@ on:
         description: 'GCP Project ID'
         type: string
         required: true
-    secrets:
-      GCP_SERVICE_ACCOUNT_JSON_KEY:
-        description: 'Service Account'
-        required: true
 
 env:
   HF_HOME: /mnt/cache