From fec797d3c7817fdec9fdec86ec4705ff6391ec79 Mon Sep 17 00:00:00 2001 From: Serhii Shymkiv Date: Thu, 26 Oct 2023 22:33:23 +0300 Subject: [PATCH] Use Mina o1js-main branch instead of rampup. --- .github/workflows/build.yml | 2 +- scripts/build-all.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e44ebe1..1b1ee5c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: host: ${{ secrets.MINA_BUILD_SYSTEM_IP }} username: ${{ secrets.MINA_BUILD_SYSTEM_SSH_USER_NAME }} key: ${{ secrets.MINA_BUILD_SYSTEM_SSH_PRIVATE_KEY }} - script: bash -ilc "${HOME}/projects/o1labs/mina-lightnet-docker/scripts/build-all.sh ${HOME}/projects/o1labs/mina ${HOME}/projects/o1labs/Archive-Node-API ${HOME}/projects/o1labs/mina-lightnet-docker ${HOME}/projects/p42/mina-accounts-manager o1labs \"develop berkeley rampup\"" + script: bash -ilc "${HOME}/projects/o1labs/mina-lightnet-docker/scripts/build-all.sh ${HOME}/projects/o1labs/mina ${HOME}/projects/o1labs/Archive-Node-API ${HOME}/projects/o1labs/mina-lightnet-docker ${HOME}/projects/p42/mina-accounts-manager o1labs \"develop berkeley o1js-main\"" command_timeout: 170m - name: Sleep for 15 seconds run: sleep 15s diff --git a/scripts/build-all.sh b/scripts/build-all.sh index 2c0403b..febcdf8 100755 --- a/scripts/build-all.sh +++ b/scripts/build-all.sh @@ -88,8 +88,8 @@ for TARGET_BRANCH in "${TARGET_BRANCHES[@]}"; do echo "[INFO] Building Mina at branch: '${TARGET_BRANCH}' and then the corresponding Docker Image" echo "" BRANCH_NAME=${TARGET_BRANCH} - if [[ $TARGET_BRANCH == "rampup" ]]; then - BRANCH_NAME="o1js-main" + if [[ $TARGET_BRANCH == "o1js-main" ]]; then + BRANCH_NAME="rampup" fi gitPullAll && gitPullAll