Merge branch 'main' into mikhail/upstream-sync

.backportrc.json

@@ -0,0 +1,12 @@
+{
+    "repoOwner": "aptos-labs",
+    "repoName": "aptos-core",
+
+    "branchLabelMapping": {
+        "^v(\\d+).(\\d+)$": "aptos-release-v$1.$2"
+    },
+    "commitConflicts": true,
+    "prTitle": "[cp][{{targetBranch}}] {{sourcePullRequest.title}}",
+    "targetPRLabels": ["cherry-pick"],
+    "assignees": ["thepomeranian"]
+}

.dockerignore

@@ -20,7 +20,7 @@
 !**/*.errmap
 !config/src/config/test_data
 !aptos-move/aptos-gas-profiling/templates/
-!aptos-move/aptos-release-builder/data/release.yaml
+!aptos-move/aptos-release-builder/data/*.yaml
 !aptos-move/aptos-release-builder/data/proposals/*
 !aptos-move/framework/
 !aptos-move/move-examples/hello_blockchain/

.github/actions/general-lints/action.yaml

@@ -29,9 +29,7 @@ runs:
 
     # Setup pnpm
     - name: Setup pnpm
-      uses: pnpm/action-setup@v2
-      with:
-        version: 8.2.0
+      uses: pnpm/action-setup@v4
 
     # Install packages for examples and run package build, lint and tests
     - name: Run ecosystem lint

.github/actions/move-tests-compiler-v2/action.yaml

@@ -13,14 +13,6 @@ runs:
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0 # Fetch all git history for accurate target determination
-    - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
-      with:
-        GIT_CREDENTIALS: ${{ inputs.GIT_CREDENTIALS }}
-
-    # Install nextest
-    - uses: taiki-e/[email protected]
-      with:
-        tool: nextest
 
     # Output the changed files
     - name: Output the changed files

.github/actions/run-ts-sdk-e2e-tests/action.yaml

@@ -38,7 +38,7 @@ runs:
     # Run a local testnet. This installs node and pnpm too.
     - uses: aptos-labs/actions/run-local-testnet@main
       with:
-        PNPM_VERSION: 8.15.6
+        PNPM_VERSION: 8.3.1
         DOCKER_ARTIFACT_REPO: ${{ inputs.GCP_DOCKER_ARTIFACT_REPO }}
         CLI_GIT_REF: ${{ steps.get-docker-image-tag.outputs.IMAGE_TAG }}
 

.github/actions/rust-check-merge-base/action.yaml

@@ -0,0 +1,19 @@
+name: Rust Check Merge Base
+description: Runs the rust merge base freshness check
+inputs:
+  GIT_CREDENTIALS:
+    description: "Optional credentials to pass to git. Useful if you need to pull private repos for dependencies"
+    required: false
+
+runs:
+  using: composite
+  steps:
+    # The source code must be checked out by the workflow that invokes this action.
+    - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
+      with:
+        GIT_CREDENTIALS: ${{ inputs.GIT_CREDENTIALS }}
+
+    # Check the freshness of the merge base
+    - name: Check the freshness of the merge base
+      run: cargo x check-merge-base -vvv
+      shell: bash

.github/actions/rust-doc-tests/action.yaml

@@ -0,0 +1,16 @@
+name: Rust Doc Tests
+description: Runs only the rust doc tests
+inputs:
+  GIT_CREDENTIALS:
+    description: "Optional credentials to pass to git. Useful if you need to pull private repos for dependencies"
+    required: false
+
+runs:
+  using: composite
+  steps:
+    # The source code must be checked out by the workflow that invokes this action.
+
+    # Run the rust doc tests
+    - name: Run rust doc tests
+      run: cargo test --profile ci --locked --doc --workspace --exclude aptos-node-checker
+      shell: bash

.github/actions/rust-lints/action.yaml

@@ -10,10 +10,6 @@ runs:
   steps:
     # The source code must be checkout out by the workflow that invokes this action.
 
-    - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
-      with:
-        GIT_CREDENTIALS: ${{ inputs.GIT_CREDENTIALS }}
-
     # Run the pre-commit checks
     - uses: pre-commit/[email protected]
 

.github/actions/rust-smoke-tests/action.yaml

@@ -10,15 +10,6 @@ runs:
   steps:
     # The source code must be checkout out by the workflow that invokes this action.
 
-    - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
-      with:
-        GIT_CREDENTIALS: ${{ inputs.GIT_CREDENTIALS }}
-
-    # Install nextest
-    - uses: taiki-e/[email protected]
-      with:
-        tool: nextest
-
     # Run a postgres database
     - name: Run postgres database
       run: docker run --detach -p 5432:5432 cimg/postgres:14.2

.github/actions/rust-targeted-unit-tests/action.yaml

@@ -9,14 +9,6 @@ runs:
   using: composite
   steps:
     # The source code must be checked out by the workflow that invokes this action.
-    - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
-      with:
-        GIT_CREDENTIALS: ${{ inputs.GIT_CREDENTIALS }}
-
-    # Install nextest
-    - uses: taiki-e/[email protected]
-      with:
-        tool: nextest
 
     # Run a postgres database
     - name: Run postgres database
@@ -25,18 +17,18 @@ runs:
 
     # Output the changed files
     - name: Output the changed files
-      run: cargo x changed-files -vv
+      run: cargo x changed-files -vvv
       shell: bash
 
     # Output the affected packages
     - name: Output the affected packages
-      run: cargo x affected-packages -vv
+      run: cargo x affected-packages -vvv
       shell: bash
 
     # Run only the targeted rust unit tests
     - name: Run only the targeted unit tests
       run: |
-        cargo x targeted-unit-tests -vv --profile ci --cargo-profile ci --locked --no-fail-fast --retries 3
+        cargo x targeted-unit-tests -vvv --profile ci --cargo-profile ci --locked --no-fail-fast --retries 3
       shell: bash
       env:
         INDEXER_DATABASE_URL: postgresql://postgres@localhost/postgres

.github/actions/rust-unit-tests/action.yaml

@@ -4,17 +4,11 @@ inputs:
   GIT_CREDENTIALS:
     description: "Optional credentials to pass to git. Useful if you need to pull private repos for dependencies"
     required: false
-  BUILDKITE_ANALYTICS_TOKEN:
-    description: "The Buildkite API token"
-    required: true
 
 runs:
   using: composite
   steps:
     # The source code must be checkout out by the workflow that invokes this action.
-    - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
-      with:
-        GIT_CREDENTIALS: ${{ inputs.GIT_CREDENTIALS }}
 
     # Check the VM features
     - name: Check VM features
@@ -26,16 +20,6 @@ runs:
       run: cargo test --profile ci --locked --doc --workspace --exclude aptos-node-checker
       shell: bash
 
-    # Install nextest
-    - uses: taiki-e/[email protected]
-      with:
-        tool: nextest
-
-    # Install buildkite-test-collector
-    - name: Install buildkite-test-collector
-      run: cargo install buildkite-test-collector
-      shell: bash
-
     # Run a postgres database
     - name: Run postgres database
       run: docker run --detach -p 5432:5432 cimg/postgres:14.2
@@ -45,7 +29,6 @@ runs:
     - name: Run all unit tests
       run: |
         NEXTEST_EXPERIMENTAL_LIBTEST_JSON=1 cargo nextest run --profile ci --cargo-profile ci --locked --workspace --exclude smoke-test --exclude aptos-testcases --exclude aptos-keyless-circuit --retries 3 --no-fail-fast --message-format libtest-json > nextest_output.json || python3 .github/actions/rust-unit-tests/nextest_summary.py nextest_output.json "$GITHUB_STEP_SUMMARY" -f
-        buildkite-test-collector < nextest_output.json || echo "Warning: buildkite-test-collector encountered an error"
         python3 .github/actions/rust-unit-tests/nextest_summary.py nextest_output.json "$GITHUB_STEP_SUMMARY" || echo "summary generation had an error"
         rm nextest_output.json
       shell: bash
@@ -58,4 +41,3 @@ runs:
         CVC5_EXE: /home/runner/bin/cvc5
         DOTNET_ROOT: /home/runner/.dotnet
         BOOGIE_EXE: /home/runner/.dotnet/tools/boogie
-        BUILDKITE_ANALYTICS_TOKEN: ${{ inputs.BUILDKITE_ANALYTICS_TOKEN }}

.github/runs-on.yml

@@ -2,4 +2,9 @@ images:
   aptos-ubuntu-x64:
     platform: "linux"
     arch: "x64"
-    ami: "ami-03b93e88e2d195770"
+    ami: "ami-07ce6402e4a205d44"
+  aptos-ubuntu-x64-latest:
+    platform: "linux"
+    arch: "x64"
+    owner: "058264343338" # aptos-ci AWS account id
+    name: "aptos-runs-on-*"