Merge branch 'main' into george/types

.github/workflows/coverage.yaml

@@ -41,6 +41,7 @@ jobs:
  - run: cargo llvm-cov --ignore-run-fail --workspace --exclude smoke-test --exclude aptos-testcases --lcov --jobs 32 --output-path lcov_unit.info -vv
  env:
  INDEXER_DATABASE_URL: postgresql://postgres@localhost/postgres
+ RUST_MIN_STACK: 33554432 # 32 MB of stack
  - uses: actions/upload-artifact@v3
  with:
  name: lcov_unit
@@ -65,6 +66,7 @@ jobs:
  - run: cargo llvm-cov --ignore-run-fail --package smoke-test --lcov --output-path lcov_smoke.info -vv
  env:
  INDEXER_DATABASE_URL: postgresql://postgres@localhost/postgres
+ RUST_MIN_STACK: 33554432
  - uses: actions/upload-artifact@v3
  with:
  name: lcov_smoke

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

@@ -300,7 +300,7 @@ jobs:
  with:
  GIT_SHA: ${{ needs.determine-docker-build-metadata.outputs.gitSha }}
  FORGE_TEST_SUITE: compat
- IMAGE_TAG: aptos-node-v1.10.1 # test against a previous testnet release
+ IMAGE_TAG: 01b24e7e3548382dd25440b39a0438a993387f12 #aptos-node-v1.11 with randomness disabled in genesis
  FORGE_RUNNER_DURATION_SECS: 300
  COMMENT_HEADER: forge-compat
  FORGE_NAMESPACE: forge-compat-${{ needs.determine-docker-build-metadata.outputs.targetCacheId }}
@@ -327,7 +327,7 @@ jobs:
  with:
  GIT_SHA: ${{ needs.determine-docker-build-metadata.outputs.gitSha }}
  FORGE_TEST_SUITE: framework_upgrade
- IMAGE_TAG: aptos-node-v1.10.1 # This workflow will test the upgradability from the current tip of the release branch to the current main branch.
+ IMAGE_TAG: 01b24e7e3548382dd25440b39a0438a993387f12 #aptos-node-v1.11 with randomness disabled in genesis
  FORGE_RUNNER_DURATION_SECS: 3600
  COMMENT_HEADER: forge-framework-upgrade
  FORGE_NAMESPACE: forge-framework-upgrade-${{ needs.determine-docker-build-metadata.outputs.targetCacheId }}

.github/workflows/forge-stable.yaml

@@ -118,19 +118,20 @@ jobs:
  ### Real-world-network tests.
  # Run forge framework upgradability test. This is a PR required job.
  run-forge-framework-upgrade-test:
+ if: ${{ github.event_name != 'pull_request' }}
  needs:
  - determine-test-metadata
  uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
  secrets: inherit
  with:
- IMAGE_TAG: aptos-node-v1.10.1 # This workflow will test the upgradability from the current tip of the release branch to the current main branch.
+ IMAGE_TAG: 01b24e7e3548382dd25440b39a0438a993387f12 #aptos-node-v1.11 with randomness disabled in genesis
  FORGE_NAMESPACE: forge-framework-upgrade-${{ needs.determine-test-metadata.outputs.BRANCH_HASH }}
  FORGE_RUNNER_DURATION_SECS: 7200 # Run for 2 hours
  FORGE_TEST_SUITE: framework_upgrade
  POST_TO_SLACK: true
 
  run-forge-realistic-env-max-load-long:
- if: ${{ github.event_name != 'pull_request' }}
+ if: ${{ github.event_name != 'pull_request' && always() }}
  needs: [determine-test-metadata, run-forge-framework-upgrade-test] # Only run after the previous job completes
  uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
  secrets: inherit
@@ -265,7 +266,7 @@ jobs:
  FORGE_RUNNER_DURATION_SECS: 300 # Run for 5 minutes
  # This will upgrade from testnet branch to the latest main
  FORGE_TEST_SUITE: compat
- IMAGE_TAG: testnet
+ IMAGE_TAG: 01b24e7e3548382dd25440b39a0438a993387f12 #aptos-node-v1.11 with randomness disabled in genesis
  GIT_SHA: ${{ needs.determine-test-metadata.outputs.IMAGE_TAG }} # this is the git ref to checkout
  POST_TO_SLACK: true
 

CODEOWNERS

@@ -1,7 +1,7 @@
 # **Please** keep this file ordered alphabetically by directory paths.
 
 # Owners for the `.github` directory and all its subdirectories.
-/.github/ @aptos-labs/prod-eng @aptos-labs/security
+/.github/ @aptos-labs/prod-eng
 
 # Owners for the `/api` directory and all its subdirectories.
 /api/ @banool @gregnazario @0xmaayan