From 898d3a73ee8fee6e8e115b4d3dc4c6e5d5fd35ba Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Wed, 6 Nov 2024 15:08:39 -0800 Subject: [PATCH 1/7] Update testing and future core version to v22.0.0 --- .github/workflows/build-future.yml | 8 ++++---- .github/workflows/build-testing.yml | 8 ++++---- Makefile | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-future.yml b/.github/workflows/build-future.yml index 103c916b..66ee98e9 100644 --- a/.github/workflows/build-future.yml +++ b/.github/workflows/build-future.yml @@ -32,8 +32,8 @@ jobs: arch: amd64 tag: ${{ inputs.tag-prefix }}future-amd64 protocol_version_default: 22 - xdr_ref: v22.0.0-rc.1.1 - core_ref: v22.0.0rc3 + xdr_ref: v22.0.0 + core_ref: v22.0.0 horizon_ref: horizon-v22.0.0-rc2 soroban_rpc_ref: v22.0.0-rc3 friendbot_ref: horizon-v22.0.0-rc2 @@ -56,8 +56,8 @@ jobs: arch: arm64 tag: ${{ inputs.tag-prefix }}future-arm64 protocol_version_default: 22 - xdr_ref: v22.0.0-rc.1.1 - core_ref: v22.0.0rc3 + xdr_ref: v22.0.0 + core_ref: v22.0.0 horizon_ref: horizon-v22.0.0-rc2 soroban_rpc_ref: v22.0.0-rc3 friendbot_ref: horizon-v22.0.0-rc2 diff --git a/.github/workflows/build-testing.yml b/.github/workflows/build-testing.yml index fdb1dde6..c32e3f55 100644 --- a/.github/workflows/build-testing.yml +++ b/.github/workflows/build-testing.yml @@ -34,8 +34,8 @@ jobs: arch: amd64 tag: ${{ inputs.tag-prefix }}testing-amd64 protocol_version_default: 22 - xdr_ref: v22.0.0-rc.1.1 - core_ref: v22.0.0rc3 + xdr_ref: v22.0.0 + core_ref: v22.0.0 horizon_ref: horizon-v22.0.0-rc2 soroban_rpc_ref: v22.0.0-rc3 friendbot_ref: horizon-v22.0.0-rc2 @@ -58,8 +58,8 @@ jobs: arch: arm64 tag: ${{ inputs.tag-prefix }}testing-arm64 protocol_version_default: 22 - xdr_ref: v22.0.0-rc.1.1 - core_ref: v22.0.0rc3 + xdr_ref: v22.0.0 + core_ref: v22.0.0 horizon_ref: horizon-v22.0.0-rc2 soroban_rpc_ref: v22.0.0-rc3 friendbot_ref: horizon-v22.0.0-rc2 diff --git a/Makefile b/Makefile index 7d732100..3cfede2a 100644 --- a/Makefile +++ b/Makefile @@ -33,8 +33,8 @@ build-latest: build-testing: $(MAKE) build TAG=testing \ PROTOCOL_VERSION_DEFAULT=22 \ - XDR_REF=v22.0.0-rc.1.1 \ - CORE_REF=v22.0.0rc3 \ + XDR_REF=v22.0.0 \ + CORE_REF=v22.0.0 \ HORIZON_REF=horizon-v22.0.0-rc2 \ SOROBAN_RPC_REF=v22.0.0-rc3 \ FRIENDBOT_REF=horizon-v22.0.0-rc2 @@ -42,8 +42,8 @@ build-testing: build-future: $(MAKE) build TAG=future \ PROTOCOL_VERSION_DEFAULT=22 \ - XDR_REF=v22.0.0-rc.1.1 \ - CORE_REF=v22.0.0rc3 \ + XDR_REF=v22.0.0 \ + CORE_REF=v22.0.0 \ HORIZON_REF=horizon-v22.0.0-rc2 \ SOROBAN_RPC_REF=v22.0.0-rc3 \ FRIENDBOT_REF=horizon-v22.0.0-rc2 From c6d74b6dbc6bb2822b9a0c19b44dc098f2e0abb1 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Wed, 6 Nov 2024 15:10:55 -0800 Subject: [PATCH 2/7] Update latest core to v22.0.0 --- .github/workflows/build-latest.yml | 24 ++++++++++++------------ Makefile | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 5e0dc1bc..f249248d 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -32,12 +32,12 @@ jobs: sha: ${{ inputs.sha }} arch: amd64 tag: ${{ inputs.tag-prefix }}latest-amd64 - protocol_version_default: 21 - xdr_ref: v21.1.0 - core_ref: v21.3.1 - horizon_ref: horizon-v2.32.0 - soroban_rpc_ref: v21.5.1 - friendbot_ref: 31fc8f4236388f12fc609228b7a7f5494867a1f9 + protocol_version_default: 22 + xdr_ref: v22.0.0 + core_ref: v22.0.0 + horizon_ref: horizon-v22.0.0-rc2 + soroban_rpc_ref: v22.0.0-rc3 + friendbot_ref: horizon-v22.0.0-rc2 test_matrix: | { "network": ["pubnet", "local"], @@ -56,12 +56,12 @@ jobs: sha: ${{ inputs.sha }} arch: arm64 tag: ${{ inputs.tag-prefix }}latest-arm64 - protocol_version_default: 21 - xdr_ref: v21.1.0 - core_ref: v21.3.1 - horizon_ref: horizon-v2.32.0 - soroban_rpc_ref: v21.5.1 - friendbot_ref: 31fc8f4236388f12fc609228b7a7f5494867a1f9 + protocol_version_default: 22 + xdr_ref: v22.0.0 + core_ref: v22.0.0 + horizon_ref: horizon-v22.0.0-rc2 + soroban_rpc_ref: v22.0.0-rc3 + friendbot_ref: horizon-v22.0.0-rc2 test_matrix: | { "network": ["pubnet", "local"], diff --git a/Makefile b/Makefile index 3cfede2a..5fc156f0 100644 --- a/Makefile +++ b/Makefile @@ -23,12 +23,12 @@ console: build-latest: $(MAKE) build TAG=latest \ - PROTOCOL_VERSION_DEFAULT=21 \ - XDR_REF=v21.1.0 \ - CORE_REF=v21.3.1 \ - HORIZON_REF=horizon-v2.32.0 \ - SOROBAN_RPC_REF=v21.5.1 \ - FRIENDBOT_REF=31fc8f4236388f12fc609228b7a7f5494867a1f9 + PROTOCOL_VERSION_DEFAULT=22 \ + XDR_REF=v22.0.0 \ + CORE_REF=v22.0.0 \ + HORIZON_REF=horizon-v22.0.0-rc2 \ + SOROBAN_RPC_REF=v22.0.0-rc3 \ + FRIENDBOT_REF=horizon-v22.0.0-rc2 build-testing: $(MAKE) build TAG=testing \ From 809b87658c426cedc03c8ec23c46576139076306 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Wed, 6 Nov 2024 15:29:25 -0800 Subject: [PATCH 3/7] undo non-core updates for latest --- .github/workflows/build-latest.yml | 12 ++++++------ Makefile | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index f249248d..868f8ebe 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -35,9 +35,9 @@ jobs: protocol_version_default: 22 xdr_ref: v22.0.0 core_ref: v22.0.0 - horizon_ref: horizon-v22.0.0-rc2 - soroban_rpc_ref: v22.0.0-rc3 - friendbot_ref: horizon-v22.0.0-rc2 + horizon_ref: horizon-v2.32.0 + soroban_rpc_ref: v21.5.1 + friendbot_ref: 31fc8f4236388f12fc609228b7a7f5494867a1f9 test_matrix: | { "network": ["pubnet", "local"], @@ -59,9 +59,9 @@ jobs: protocol_version_default: 22 xdr_ref: v22.0.0 core_ref: v22.0.0 - horizon_ref: horizon-v22.0.0-rc2 - soroban_rpc_ref: v22.0.0-rc3 - friendbot_ref: horizon-v22.0.0-rc2 + horizon_ref: horizon-v2.32.0 + soroban_rpc_ref: v21.5.1 + friendbot_ref: 31fc8f4236388f12fc609228b7a7f5494867a1f9 test_matrix: | { "network": ["pubnet", "local"], diff --git a/Makefile b/Makefile index 5fc156f0..8fc6d4e4 100644 --- a/Makefile +++ b/Makefile @@ -23,12 +23,12 @@ console: build-latest: $(MAKE) build TAG=latest \ - PROTOCOL_VERSION_DEFAULT=22 \ + PROTOCOL_VERSION_DEFAULT=22 \ XDR_REF=v22.0.0 \ CORE_REF=v22.0.0 \ - HORIZON_REF=horizon-v22.0.0-rc2 \ - SOROBAN_RPC_REF=v22.0.0-rc3 \ - FRIENDBOT_REF=horizon-v22.0.0-rc2 + HORIZON_REF=horizon-v2.32.0 \ + SOROBAN_RPC_REF=v21.5.1 \ + FRIENDBOT_REF=31fc8f4236388f12fc609228b7a7f5494867a1f9 build-testing: $(MAKE) build TAG=testing \ From a84ff5997fc916ceb2210220f14a0277e66e137a Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Wed, 6 Nov 2024 19:28:46 -0800 Subject: [PATCH 4/7] Update .github/workflows/build-latest.yml Co-authored-by: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> --- .github/workflows/build-latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 868f8ebe..6e9764ce 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -32,7 +32,7 @@ jobs: sha: ${{ inputs.sha }} arch: amd64 tag: ${{ inputs.tag-prefix }}latest-amd64 - protocol_version_default: 22 + protocol_version_default: 21 xdr_ref: v22.0.0 core_ref: v22.0.0 horizon_ref: horizon-v2.32.0 From e35fb1368382fc975418e03ec898c42761dd1385 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Wed, 6 Nov 2024 19:28:58 -0800 Subject: [PATCH 5/7] Update Makefile Co-authored-by: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8fc6d4e4..c0a969c0 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ console: build-latest: $(MAKE) build TAG=latest \ - PROTOCOL_VERSION_DEFAULT=22 \ + PROTOCOL_VERSION_DEFAULT=21 \ XDR_REF=v22.0.0 \ CORE_REF=v22.0.0 \ HORIZON_REF=horizon-v2.32.0 \ From fc523d4df61b69012681544c9f0c24f7904ada49 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Wed, 6 Nov 2024 19:29:04 -0800 Subject: [PATCH 6/7] Update .github/workflows/build-latest.yml Co-authored-by: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> --- .github/workflows/build-latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 6e9764ce..65394c32 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -56,7 +56,7 @@ jobs: sha: ${{ inputs.sha }} arch: arm64 tag: ${{ inputs.tag-prefix }}latest-arm64 - protocol_version_default: 22 + protocol_version_default: 21 xdr_ref: v22.0.0 core_ref: v22.0.0 horizon_ref: horizon-v2.32.0 From 426e931d1df3c208537a0003980c49efb97b0303 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Thu, 7 Nov 2024 12:16:06 -0800 Subject: [PATCH 7/7] fix whitespace --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c0a969c0..2248ace3 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ console: build-latest: $(MAKE) build TAG=latest \ - PROTOCOL_VERSION_DEFAULT=21 \ + PROTOCOL_VERSION_DEFAULT=21 \ XDR_REF=v22.0.0 \ CORE_REF=v22.0.0 \ HORIZON_REF=horizon-v2.32.0 \