Merge branch 'main' into vk/variable-window-peephole

.dockerignore

@@ -31,7 +31,7 @@
 !api/doc/
 !crates/indexer/migrations/**/*.sql
 !ecosystem/indexer-grpc/indexer-grpc-parser/migrations/**/*.sql
-!ecosystem/nft-metadata-crawler-parser/migrations/**/*.sql
+!ecosystem/nft-metadata-crawler/migrations/**/*.sql
 !rust-toolchain.toml
 !scripts/
 !terraform/helm/aptos-node/

.github/actions/fullnode-sync/action.yaml

@@ -27,11 +27,6 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Install Dependencies
-      shell: bash
-      run: |
-        echo "${HOME}/bin/" >> $GITHUB_PATH # default INSTALL_DIR to path
-        scripts/dev_setup.sh -b # Install dependencies
     - name: Run fullnode sync
       shell: bash
       run: |

.github/workflows/copy-images-to-dockerhub.yaml

@@ -10,6 +10,11 @@ on:
         required: false
         type: string
         description: the git sha to use for the image tag. If not provided, the git sha of the triggering branch will be used
+      dry_run:
+        required: false
+        type: boolean
+        default: false
+        description: If true, run the workflow without actually pushing images
   workflow_dispatch:
     inputs:
       image_tag_prefix:
@@ -21,6 +26,11 @@ on:
         required: false
         type: string
         description: the git sha to use for the image tag. If not provided, the git sha of the triggering branch will be used
+      dry_run:
+        required: false
+        type: boolean
+        default: false
+        description: If true, run the workflow without actually pushing images
 
 permissions:
   contents: read
@@ -29,7 +39,7 @@ permissions:
 jobs:
   copy-images:
     # Run on a machine with more local storage for large docker images
-    runs-on: medium-perf-docker-with-local-ssd
+    runs-on: runs-on,cpu=16,family=m6id,hdd=500,image=aptos-ubuntu-x64,run-id=${{ github.run_id }}
     steps:
       - uses: actions/checkout@v4
 
@@ -61,4 +71,5 @@ jobs:
           AWS_ACCOUNT_ID: ${{ secrets.AWS_ECR_ACCOUNT_NUM }}
           GCP_DOCKER_ARTIFACT_REPO: ${{ vars.GCP_DOCKER_ARTIFACT_REPO }}
           IMAGE_TAG_PREFIX: ${{ inputs.image_tag_prefix }}
-        run: ./docker/release-images.mjs --wait-for-image-seconds=3600
+          DRY_RUN: ${{ inputs.dry_run }}
+        run: ./docker/release-images.mjs --wait-for-image-seconds=3600 ${{ inputs.dry_run && '--dry-run' || '' }}

.github/workflows/docker-build-test.yaml

@@ -245,17 +245,6 @@ jobs:
       GIT_SHA: ${{ needs.determine-docker-build-metadata.outputs.gitSha }}
       SKIP_JOB: ${{ needs.file_change_determinator.outputs.only_docs_changed == 'true' }}
 
-  indexer-grpc-e2e-tests:
-    needs: [permission-check, rust-images, determine-docker-build-metadata] # runs with the default release docker build variant "rust-images"
-    if: |
-      github.event_name == 'workflow_dispatch' ||
-      contains(github.event.pull_request.labels.*.name, 'CICD:run-e2e-tests') ||
-      contains(github.event.pull_request.body, '#e2e')
-    uses: aptos-labs/aptos-core/.github/workflows/docker-indexer-grpc-test.yaml@main
-    secrets: inherit
-    with:
-      GIT_SHA: ${{ needs.determine-docker-build-metadata.outputs.gitSha }}
-
   # This is a PR required job.
   forge-e2e-test:
     needs:

.github/workflows/docker-indexer-grpc-test.yaml

@@ -1,3 +1,5 @@
+# THIS WORKFLOW IS DEPRECATED. Keep it around for branches that still reference it on the main branch.
+# This file should eventually be deleted.
 name: "Docker Indexer gRPC test"
 on:
   pull_request:

.github/workflows/execution-performance.yaml

@@ -23,6 +23,6 @@ jobs:
       GIT_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
       RUNNER_NAME: executor-benchmark-runner
        # Run all tests only on the scheduled cadence, or explicitly requested
-      IS_FULL_RUN: ${{ github.event_name == 'schedule' || contains(github.event.pull_request.labels.*.name, 'CICD:run-execution-performance-full-test') }}
+      FLOW: ${{ (github.event_name == 'schedule' || contains(github.event.pull_request.labels.*.name, 'CICD:run-execution-performance-full-test')) && 'CONTINUOUS' || 'LAND_BLOCKING' }}
       # Ignore target determination if on the scheduled cadence, or explicitly requested
       IGNORE_TARGET_DETERMINATION: ${{ github.event_name == 'schedule' || contains(github.event.pull_request.labels.*.name, 'CICD:run-execution-performance-test') || contains(github.event.pull_request.labels.*.name, 'CICD:run-execution-performance-full-test') }}

.github/workflows/forge-stable.yaml

@@ -68,26 +68,19 @@ jobs:
           elif [[ "${{ github.event_name }}" == "push" ]]; then
               echo "Branch: ${{ github.ref_name }}"
               echo "BRANCH=${{ github.ref_name }}" >> $GITHUB_OUTPUT
-          else
-            echo "Using GIT_SHA"
-            # on workflow_dispatch, this will simply use the inputs.GIT_SHA given (or the default)
-            # on pull_request, this will default to null and the following "checkout" step will use the PR's base branch
+          # on workflow_dispatch, this will simply use the inputs.GIT_SHA given (or the default)
+          elif [[ -n "${{ inputs.GIT_SHA }}" ]]; then
             echo "BRANCH=${{ inputs.GIT_SHA }}" >> $GITHUB_OUTPUT
+          # if GIT_SHA not provided, use the branch where workflow runs on
+          else
+            echo "BRANCH=${{ github.head_ref }}" >> $GITHUB_OUTPUT
           fi
-
       # Use the branch hash instead of the full branch name to stay under kubernetes namespace length limit
       - name: Hash the branch
         id: hash-branch
         run: |
-          # If BRANCH is empty, default to "main"
-          if [ -z "${{ steps.determine-test-branch.outputs.BRANCH }}" ]; then
-            BRANCH="main"
-          else
-            BRANCH="${{ steps.determine-test-branch.outputs.BRANCH }}"
-          fi
-
           # Hashing the branch name
-          echo "BRANCH_HASH=$(echo -n "$BRANCH" | sha256sum | cut -c1-10)" >> $GITHUB_OUTPUT
+          echo "BRANCH_HASH=$(echo -n "${{ steps.determine-test-branch.outputs.BRANCH }}" | sha256sum | cut -c1-10)" >> $GITHUB_OUTPUT
 
       - uses: aptos-labs/aptos-core/.github/actions/check-aptos-core@main
         with:
@@ -111,7 +104,7 @@ jobs:
           branch: ${{ steps.determine-test-branch.outputs.BRANCH }}
           variants: "failpoints performance"
 
-      - uses: ./.github/actions/determine-or-use-target-branch-and-get-last-released-image
+      - uses: aptos-labs/aptos-core/.github/actions/determine-or-use-target-branch-and-get-last-released-image@main
         id: get-last-released-image-tag-for-compat-test
         with:
           base-branch: ${{ steps.determine-test-branch.outputs.BRANCH }}