From 3e5a3a32968d271bf2580bc306accf4f547d0390 Mon Sep 17 00:00:00 2001 From: Tsachi Herman <24438559+tsachiherman@users.noreply.github.com> Date: Thu, 21 Sep 2023 15:13:31 -0400 Subject: [PATCH] update (#500) --- .github/workflows/build-latest.yml | 6 ++++-- .github/workflows/build-soroban-dev.yml | 17 ++++++++--------- .github/workflows/build-testing.yml | 12 ++++++++---- Makefile | 9 +++++---- 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 40536828..e31aa028 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -41,7 +41,7 @@ jobs: soroban_tools_ref: v0.4.0 test_matrix: | { - "network": ["testnet", "pubnet", "local"], + "network": ["pubnet", "local"], "options": ["", "--enable-horizon-captive-core"] } @@ -54,11 +54,13 @@ jobs: arch: arm64 tag: latest-arm64 core_ref: v19.14.0 + core_build_runner_type: ubuntu-latest-16-cores go_ref: horizon-v2.26.1 soroban_tools_ref: v0.4.0 + soroban_rpc_build_runner_type: ubuntu-latest-16-cores test_matrix: | { - "network": ["testnet", "pubnet", "local"], + "network": ["pubnet", "local"], "options": ["", "--enable-horizon-captive-core"] } diff --git a/.github/workflows/build-soroban-dev.yml b/.github/workflows/build-soroban-dev.yml index 7de5beb5..2be7b8f8 100644 --- a/.github/workflows/build-soroban-dev.yml +++ b/.github/workflows/build-soroban-dev.yml @@ -6,7 +6,7 @@ name: Soroban-Dev on: push: branches: - - master + - master pull_request: # Prevent more than one build of this workflow for a branch to be running at the @@ -18,13 +18,14 @@ concurrency: cancel-in-progress: true jobs: + complete: if: always() needs: [manifest] runs-on: ubuntu-latest steps: - - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') - run: exit 1 + - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') + run: exit 1 amd64: uses: ./.github/workflows/build.yml @@ -34,11 +35,10 @@ jobs: with: arch: amd64 tag: soroban-dev-amd64 - core_ref: v20.0.0rc1 - core_configure_flags: --disable-tests + core_ref: v20.0.0rc2 core_supports_testing_soroban_high_limit_override: "true" go_ref: horizon-v2.27.0-rc1 - soroban_tools_ref: v20.0.0-rc2 + soroban_tools_ref: v20.0.0-rc3 test_matrix: | { "network": ["local"], @@ -53,12 +53,11 @@ jobs: with: arch: arm64 tag: soroban-dev-arm64 - core_ref: v20.0.0rc1 - core_configure_flags: --disable-tests + core_ref: v20.0.0rc2 core_supports_testing_soroban_high_limit_override: "true" core_build_runner_type: ubuntu-latest-16-cores go_ref: horizon-v2.27.0-rc1 - soroban_tools_ref: v20.0.0-rc2 + soroban_tools_ref: v20.0.0-rc3 soroban_rpc_build_runner_type: ubuntu-latest-16-cores test_matrix: | { diff --git a/.github/workflows/build-testing.yml b/.github/workflows/build-testing.yml index 78fcb5c6..c7869102 100644 --- a/.github/workflows/build-testing.yml +++ b/.github/workflows/build-testing.yml @@ -37,9 +37,10 @@ jobs: with: arch: amd64 tag: testing-amd64 - core_ref: v20.0.0rc1 + core_ref: v20.0.0rc2 + core_supports_testing_soroban_high_limit_override: "true" go_ref: horizon-v2.27.0-rc1 - soroban_tools_ref: v20.0.0-rc2 + soroban_tools_ref: v20.0.0-rc3 test_matrix: | { "network": ["testnet", "pubnet", "local"], @@ -60,9 +61,12 @@ jobs: with: arch: arm64 tag: testing-arm64 - core_ref: v20.0.0rc1 + core_ref: v20.0.0rc2 + core_supports_testing_soroban_high_limit_override: "true" + core_build_runner_type: ubuntu-latest-16-cores go_ref: horizon-v2.27.0-rc1 - soroban_tools_ref: v20.0.0-rc2 + soroban_tools_ref: v20.0.0-rc3 + soroban_rpc_build_runner_type: ubuntu-latest-16-cores test_matrix: | { "network": ["testnet", "pubnet", "local"], diff --git a/Makefile b/Makefile index 937a8aa5..fdfc0592 100644 --- a/Makefile +++ b/Makefile @@ -25,16 +25,17 @@ build-latest: build-testing: $(MAKE) build TAG=testing \ - CORE_REF=v20.0.0rc1 \ + CORE_REF=v20.0.0rc2 \ + CORE_SUPPORTS_TESTING_SOROBAN_HIGH_LIMIT_OVERRIDE=true \ HORIZON_REF=horizon-v2.27.0-rc1 \ - SOROBAN_RPC_REF=v20.0.0-rc2 + SOROBAN_RPC_REF=v20.0.0-rc3 build-soroban-dev: $(MAKE) build TAG=soroban-dev \ - CORE_REF=v20.0.0rc1 \ + CORE_REF=v20.0.0rc2 \ CORE_SUPPORTS_TESTING_SOROBAN_HIGH_LIMIT_OVERRIDE=true \ HORIZON_REF=horizon-v2.27.0-rc1 \ - SOROBAN_RPC_REF=v20.0.0-rc2 + SOROBAN_RPC_REF=v20.0.0-rc3 build: $(MAKE) -j 4 build-deps