From 3ffe0986b5fe4acb76544ae7ae85d73b91a6a411 Mon Sep 17 00:00:00 2001 From: Junkil Park Date: Fri, 17 May 2024 17:46:48 -0700 Subject: [PATCH] Update release.yaml (#13310) --- .github/workflows/docker-build-test.yaml | 4 ++-- .github/workflows/forge-stable.yaml | 4 ++-- .../aptos-release-builder/data/release.yaml | 16 +++++++--------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docker-build-test.yaml b/.github/workflows/docker-build-test.yaml index efccf0e2c2f78..207be98d66e68 100644 --- a/.github/workflows/docker-build-test.yaml +++ b/.github/workflows/docker-build-test.yaml @@ -312,7 +312,7 @@ jobs: with: GIT_SHA: ${{ needs.determine-docker-build-metadata.outputs.gitSha }} FORGE_TEST_SUITE: compat - IMAGE_TAG: 01b24e7e3548382dd25440b39a0438a993387f12 #aptos-node-v1.11 with randomness disabled in genesis + IMAGE_TAG: c90dafdb2f450e4d3aa16b1a7cff8e3cad2b882e #aptos-node-v1.12.0 FORGE_RUNNER_DURATION_SECS: 300 COMMENT_HEADER: forge-compat FORGE_NAMESPACE: forge-compat-${{ needs.determine-docker-build-metadata.outputs.targetCacheId }} @@ -340,7 +340,7 @@ jobs: with: GIT_SHA: ${{ needs.determine-docker-build-metadata.outputs.gitSha }} FORGE_TEST_SUITE: framework_upgrade - IMAGE_TAG: 01b24e7e3548382dd25440b39a0438a993387f12 #aptos-node-v1.11 with randomness disabled in genesis + IMAGE_TAG: c90dafdb2f450e4d3aa16b1a7cff8e3cad2b882e #aptos-node-v1.12.0 FORGE_RUNNER_DURATION_SECS: 3600 COMMENT_HEADER: forge-framework-upgrade FORGE_NAMESPACE: forge-framework-upgrade-${{ needs.determine-docker-build-metadata.outputs.targetCacheId }} diff --git a/.github/workflows/forge-stable.yaml b/.github/workflows/forge-stable.yaml index 3ee64df78ab4f..64c45b8ba414d 100644 --- a/.github/workflows/forge-stable.yaml +++ b/.github/workflows/forge-stable.yaml @@ -128,7 +128,7 @@ jobs: uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main secrets: inherit with: - IMAGE_TAG: 01b24e7e3548382dd25440b39a0438a993387f12 #aptos-node-v1.11 with randomness disabled in genesis + IMAGE_TAG: c90dafdb2f450e4d3aa16b1a7cff8e3cad2b882e #aptos-node-v1.12.0 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 @@ -270,7 +270,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: 01b24e7e3548382dd25440b39a0438a993387f12 #aptos-node-v1.11 with randomness disabled in genesis + IMAGE_TAG: c90dafdb2f450e4d3aa16b1a7cff8e3cad2b882e #aptos-node-v1.12.0 GIT_SHA: ${{ needs.determine-test-metadata.outputs.IMAGE_TAG }} # this is the git ref to checkout POST_TO_SLACK: true diff --git a/aptos-move/aptos-release-builder/data/release.yaml b/aptos-move/aptos-release-builder/data/release.yaml index 365fbc1e305f2..3bb7e14b1f885 100644 --- a/aptos-move/aptos-release-builder/data/release.yaml +++ b/aptos-move/aptos-release-builder/data/release.yaml @@ -1,26 +1,24 @@ --- remote_endpoint: ~ -name: "v1.12" +name: "v1.13" proposals: - - name: step_1_increase_max_txn_gas + - name: step_1_upgrade_gas_schedule metadata: - title: "Increase max txn gas temporarily for framework upgrade" - description: "Increase max txn gas temporarily for framework upgrade" + title: "Gas schedule upgrade" + description: "Upgrades the gas schedule to version 18, enabling separate limits for governance proposals" execution_mode: MultiStep update_sequence: - DefaultGasWithOverride: - feature_version: 16 + feature_version: 17 overrides: - name: "txn.max_execution_gas" value: 4000000000 - name: step_2_upgrade_framework metadata: - title: "Multi-step proposal to upgrade mainnet framework to v1.12" - description: "This includes changes in https://github.com/aptos-labs/aptos-core/commits/aptos-release-v1.12" + title: "Multi-step proposal to upgrade mainnet framework to v1.13" + description: "This includes changes in https://github.com/aptos-labs/aptos-core/commits/aptos-release-v1.13" execution_mode: MultiStep update_sequence: - Framework: bytecode_version: 6 git_hash: ~ - - DefaultGasWithOverride: - feature_version: 17