Merge branch 'jkao97/verify-and-build-images-for-workflows' into jkao97/test-verify-and-build-images-for-workflows

Author: jkao97

.github/workflows/workflow-run-docker-rust-build.yaml

@@ -73,23 +73,36 @@ permissions:
   id-token: write #required for GCP Workload Identity federation which we use to login into Google Artifact Registry
 
 jobs:
-  pre-build-validation:
-    outputs: 
-      image-exist: ${{ steps.set-output.outputs.image-exist }}
-    runs-on: runs-on,cpu=4,family=c7,image=aptos-ubuntu-x64,run-id=${{ github.run_id }},spot=co,disk=small
-    steps:       
+  rust-all:
+    runs-on: runs-on,cpu=64,family=c7,image=aptos-ubuntu-x64,run-id=${{ github.run_id }},spot=co,disk=large
+    steps:
       - uses: actions/checkout@v4
         with:
           ref: ${{ env.GIT_SHA }}
 
-      - name: Authenticate to Google Cloud
-        id: auth
-        uses: "google-github-actions/auth@v2"
+      - name: Setup Runs On Cache for Docker
+        uses: runs-on/cache@v4
+        with:
+          path: |
+            /home/runner/docker-cache.tzst
+          key: docker-buildkit-cache-${{ env.PROFILE }}-${{ env.FEATURES }}${{ hashFiles('Cargo.lock') }}
+
+      - name: Untar cache if present
+        run: |
+          if [ -f /home/runner/docker-cache.tzst ]; then
+            sudo systemctl stop docker
+            sudo tar --posix -xf /home/runner/docker-cache.tzst -P -C /var/lib/docker --use-compress-program zstdmt .
+            sudo systemctl start docker
+          fi          
+
+      - uses: aptos-labs/aptos-core/.github/actions/docker-setup@main
         with:
-          workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
-          service_account: ${{ secrets.GCP_SERVICE_ACCOUNT_EMAIL }}
-          export_environment_variables: false
-          create_credentials_file: true
+          GCP_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
+          GCP_SERVICE_ACCOUNT_EMAIL: ${{ secrets.GCP_SERVICE_ACCOUNT_EMAIL }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DOCKER_ARTIFACT_REPO: ${{ secrets.AWS_DOCKER_ARTIFACT_REPO }}
+          GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
 
       - name: Check if docker images already exist
         id: check-images
@@ -99,15 +112,6 @@ jobs:
           GIT_SHA: ${{ env.GIT_SHA }}
           GCP_DOCKER_ARTIFACT_REPO: ${{ env.GCP_DOCKER_ARTIFACT_REPO }}
           WAIT_FOR_IMAGE_SECONDS: 1
-
-      - name: Set output
-        id: set-output
-        run: |
-          if [ "${{ steps.check-images.outcome }}" = "success" ]; then
-            echo "image-exist=true" >> $GITHUB_OUTPUT
-          else
-            echo "image-exist=false" >> $GITHUB_OUTPUT
-          fi
 
       - name: Lock File Check and Lock if not exists
         id: check-lock
@@ -128,39 +132,6 @@ jobs:
             echo "Docker Build locked"
           fi
 
-  rust-all:
-    runs-on: runs-on,cpu=64,family=c7,image=aptos-ubuntu-x64,run-id=${{ github.run_id }},spot=co,disk=large
-    needs: pre-build-validation
-    if: needs.pre-build-validation.outputs.image-exist == 'false'
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ env.GIT_SHA }}
-
-      - name: Setup Runs On Cache for Docker
-        uses: runs-on/cache@v4
-        with:
-          path: |
-            /home/runner/docker-cache.tzst
-          key: docker-buildkit-cache-${{ env.PROFILE }}-${{ env.FEATURES }}${{ hashFiles('Cargo.lock') }}
-
-      - name: Untar cache if present
-        run: |
-          if [ -f /home/runner/docker-cache.tzst ]; then
-            sudo systemctl stop docker
-            sudo tar --posix -xf /home/runner/docker-cache.tzst -P -C /var/lib/docker --use-compress-program zstdmt .
-            sudo systemctl start docker
-          fi          
-
-      - uses: aptos-labs/aptos-core/.github/actions/docker-setup@main
-        with:
-          GCP_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
-          GCP_SERVICE_ACCOUNT_EMAIL: ${{ secrets.GCP_SERVICE_ACCOUNT_EMAIL }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_DOCKER_ARTIFACT_REPO: ${{ secrets.AWS_DOCKER_ARTIFACT_REPO }}
-          GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
-
       - name: Build and Push Rust images
         run: docker/builder/docker-bake-rust-all.sh
         env: