From 1ca7ee8bacbf01b753bea6202b3fbc4d88c2a6dc Mon Sep 17 00:00:00 2001 From: Bradley Hart Date: Thu, 8 Jul 2021 02:47:41 -0400 Subject: [PATCH 1/2] Changes to workflows, dockerfile, script --- .github/eosjs-ci/Dockerfile | 67 ++- .github/eosjs-ci/scripts/deploy_contracts.sh | 133 ++++-- .github/workflows/build-docker-develop.yml | 35 -- .github/workflows/build-docker-images.yml | 163 ++++++++ .github/workflows/build-docker-release.yml | 38 -- .../workflows/integration-test-develop.yml | 49 --- .../workflows/integration-test-release.yml | 49 --- .github/workflows/integration-tests.yml | 385 ++++++++++++++++++ 8 files changed, 685 insertions(+), 234 deletions(-) delete mode 100644 .github/workflows/build-docker-develop.yml create mode 100644 .github/workflows/build-docker-images.yml delete mode 100644 .github/workflows/build-docker-release.yml delete mode 100644 .github/workflows/integration-test-develop.yml delete mode 100644 .github/workflows/integration-test-release.yml create mode 100644 .github/workflows/integration-tests.yml diff --git a/.github/eosjs-ci/Dockerfile b/.github/eosjs-ci/Dockerfile index f26af56d7..c04e22d12 100644 --- a/.github/eosjs-ci/Dockerfile +++ b/.github/eosjs-ci/Dockerfile @@ -5,47 +5,72 @@ ARG EOSBRANCH=develop ARG CDTBRANCH=develop FROM eosio/eosio.cdt:${CDTBRANCH} as contracts +ARG CDTBRANCH WORKDIR /root -### base RUN apt-get update \ && apt-get install -yq curl git -RUN git clone https://github.com/EOSIO/eos \ +RUN if [ "$CDTBRANCH" = "release_1.7.x" ]; then \ + git clone https://github.com/EOSIO/tropical-example-web-app \ + && mkdir -p /root/contracts/eosio.bios_v1.8.3 && mv ./tropical-example-web-app/eosio/contracts/eosio.bios-v1.8.3/* /root/contracts/eosio.bios_v1.8.3/ \ + + && git clone https://github.com/EOSIO/eos \ && cd eos \ - && git checkout develop + && git checkout v2.0.12 \ + && mkdir -p /root/contracts/eosio.bios/ && mv ./unittests/contracts/eosio.bios/* /root/contracts/eosio.bios/ \ + && mkdir -p /root/contracts/eosio.system/ && mv ./unittests/contracts/eosio.system/* /root/contracts/eosio.system/ \ + && mkdir -p /root/contracts/eosio.msig/ && mv ./unittests/contracts/eosio.msig/* /root/contracts/eosio.msig/ \ + && mkdir -p /root/contracts/eosio.token/ && mv ./unittests/contracts/eosio.token/* /root/contracts/eosio.token/ \ + ; fi -RUN git clone https://github.com/EOSIO/eosio.contracts \ - && cd eosio.contracts \ +RUN if [ "$CDTBRANCH" = "release_1.8.x" ] || [ "$CDTBRANCH" = "develop" ]; then \ + git clone https://github.com/EOSIO/eos \ + && cd eos \ && git checkout develop \ - && mkdir build && cd build && mkdir eosio.token && cd .. \ - && eosio-cpp -abigen ./contracts/eosio.token/src/eosio.token.cpp -o ./build/eosio.token/eosio.token.wasm -R ./contracts/eosio.token/ricardian/ -I ./contracts/eosio.token/include/ + && mkdir -p /root/contracts/eosio.bios/ && mv ./contracts/contracts/eosio.bios/bin/* /root/contracts/eosio.bios/ \ + && mkdir -p /root/contracts/eosio.boot/ && mv ./contracts/contracts/eosio.boot/bin/* /root/contracts/eosio.boot/ \ + && mkdir -p /root/contracts/eosio.system/ && mv ./unittests/contracts/eosio.system/* /root/contracts/eosio.system/ \ + && mkdir -p /root/contracts/eosio.msig/ && mv ./unittests/contracts/eosio.msig/* /root/contracts/eosio.msig/ \ + && mkdir -p /root/contracts/eosio.token/ && mv ./unittests/contracts/eosio.token/* /root/contracts/eosio.token/ \ + ; fi -RUN git clone https://github.com/EOSIO/key-value-example-app.git \ +RUN if [ "$CDTBRANCH" = "develop" ]; then \ + git clone https://github.com/EOSIO/eosio.cdt \ + && cd eosio.cdt \ + && git checkout develop \ + && mkdir -p build/read_only_query_tests/ \ + && eosio-cpp -abigen ./tests/unit/test_contracts/read_only_query_tests.cpp -o ./build/read_only_query_tests/read_only_query_tests.wasm \ + && mkdir -p /root/contracts/read_only_query_tests/ && mv ./build/read_only_query_tests/* /root/contracts/read_only_query_tests/ \ + ; fi + +RUN if [ "$CDTBRANCH" = "release_1.8.x" ] || [ "$CDTBRANCH" = "develop" ]; then \ + git clone https://github.com/EOSIO/key-value-example-app.git \ && cd key-value-example-app \ - && eosio-cpp -abigen ./contracts/kv_todo/src/kv_todo.cpp -o ./contracts/kv_todo/build/kv_todo.wasm -R ./contracts/kv_todo/ricardian/ -I ./contracts/kv_todo/include/ + && eosio-cpp -abigen ./contracts/kv_todo/src/kv_todo.cpp -o ./contracts/kv_todo/build/kv_todo.wasm -R ./contracts/kv_todo/ricardian/ -I ./contracts/kv_todo/include/ \ + && mkdir -p /root/contracts/kv_todo/ && mv ./contracts/kv_todo/build/* /root/contracts/kv_todo/ \ + ; fi -RUN git clone https://github.com/EOSIO/return-values-example-app.git \ +RUN if [ "$CDTBRANCH" = "release_1.8.x" ] || [ "$CDTBRANCH" = "develop" ]; then \ + git clone https://github.com/EOSIO/return-values-example-app.git \ && cd return-values-example-app \ - && eosio-cpp -abigen ./contracts/action_return_value/src/action_return_value.cpp -o ./contracts/action_return_value/build/action_return_value.wasm -R ./contracts/action_return_value/ricardian/ + && eosio-cpp -abigen ./contracts/action_return_value/src/action_return_value.cpp -o ./contracts/action_return_value/build/action_return_value.wasm -R ./contracts/action_return_value/ricardian/ \ + && mkdir -p /root/contracts/action_return_value/ && mv ./contracts/action_return_value/build/* /root/contracts/action_return_value/ \ + ; fi RUN mkdir cfhello COPY ./contracts/cfhello.cpp /root/cfhello RUN cd cfhello \ && mkdir build \ - && eosio-cpp -abigen ./cfhello.cpp -o ./build/cfhello.wasm - + && eosio-cpp -abigen ./cfhello.cpp -o ./build/cfhello.wasm \ + && mkdir -p /root/contracts/cfhello/ && mv ./build/* /root/contracts/cfhello/ FROM eosio/eosio:${EOSBRANCH} -ENTRYPOINT ["nodeos", "--data-dir", "/root/.local/share", "-e", "-p", "eosio", "--replay-blockchain", "--plugin", "eosio::producer_plugin", "--plugin", "eosio::chain_api_plugin", "--plugin", "eosio::trace_api_plugin", "--trace-no-abis", "--plugin", "eosio::db_size_api_plugin", "--plugin", "eosio::http_plugin", "--http-server-address=0.0.0.0:8888", "--access-control-allow-origin=*", "--contracts-console", "--http-validate-host=false", "--enable-account-queries=true", "--verbose-http-errors", "--max-transaction-time=100"] +ARG EOSBRANCH +ENTRYPOINT ["nodeos", "--data-dir", "/root/.local/share", "-e", "-p", "eosio", "--replay-blockchain", "--plugin", "eosio::producer_plugin", "--plugin", "eosio::producer_api_plugin", "--plugin", "eosio::chain_api_plugin", "--plugin", "eosio::trace_api_plugin", "--trace-no-abis", "--plugin", "eosio::db_size_api_plugin", "--plugin", "eosio::http_plugin", "--http-server-address=0.0.0.0:8888", "--access-control-allow-origin=*", "--contracts-console", "--http-validate-host=false", "--enable-account-queries=true", "--verbose-http-errors", "--max-transaction-time=100"] WORKDIR /root RUN mkdir -p "/opt/eosio/bin/contracts" -COPY --from=contracts /root/eos/contracts/contracts/eosio.bios/bin/* /opt/eosio/bin/contracts/eosio.bios/ -COPY --from=contracts /root/eos/contracts/contracts/eosio.boot/bin/* /opt/eosio/bin/contracts/eosio.boot/ -COPY --from=contracts /root/eosio.contracts/build/ /opt/eosio/bin/contracts -COPY --from=contracts /root/key-value-example-app/contracts/kv_todo/build/* /opt/eosio/bin/contracts/kv_todo/ -COPY --from=contracts /root/return-values-example-app/contracts/action_return_value/build/* /opt/eosio/bin/contracts/action_return_value/ -COPY --from=contracts /root/cfhello/build/* /opt/eosio/bin/contracts/cfhello/ +COPY --from=contracts /root/contracts /opt/eosio/bin/contracts/ COPY ./ /opt/eosio/bin/ RUN mkdir -p "/opt/eosio/bin/config-dir" -RUN /bin/bash /opt/eosio/bin/scripts/deploy_contracts.sh +RUN /bin/bash /opt/eosio/bin/scripts/deploy_contracts.sh "$EOSBRANCH" diff --git a/.github/eosjs-ci/scripts/deploy_contracts.sh b/.github/eosjs-ci/scripts/deploy_contracts.sh index f4a694e96..38d3264de 100644 --- a/.github/eosjs-ci/scripts/deploy_contracts.sh +++ b/.github/eosjs-ci/scripts/deploy_contracts.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash -NODEOS_RUNNING=$1 +EOS_BRANCH=$1 +echo $EOS_BRANCH set -m @@ -109,9 +110,8 @@ mkdir -p $CONFIG_DIR mkdir -p $BLOCKCHAIN_DATA_DIR mkdir -p $BLOCKCHAIN_CONFIG_DIR -if [ -z "$NODEOS_RUNNING" ]; then - echo "Starting the chain for setup" - nodeos -e -p eosio \ +echo "Starting the chain for setup" +nodeos -e -p eosio \ --data-dir $BLOCKCHAIN_DATA_DIR \ --config-dir $BLOCKCHAIN_CONFIG_DIR \ --http-validate-host=false \ @@ -127,7 +127,6 @@ if [ -z "$NODEOS_RUNNING" ]; then --enable-account-queries=true \ --max-transaction-time=100000 \ --verbose-http-errors & -fi mkdir -p "$CONFIG_DIR"/keys @@ -162,25 +161,44 @@ cleos create account eosio eosio.vpay $SYSTEM_ACCOUNT_PUBLIC_KEY cleos create account eosio eosio.rex $SYSTEM_ACCOUNT_PUBLIC_KEY cleos create account eosio eosio.token $SYSTEM_ACCOUNT_PUBLIC_KEY cleos create account eosio returnvalue $SYSTEM_ACCOUNT_PUBLIC_KEY +cleos create account eosio readonly $EXAMPLE_ACCOUNT_PUBLIC_KEY cleos create account eosio todo $SYSTEM_ACCOUNT_PUBLIC_KEY -cleos create account eosio bob $EXAMPLE_ACCOUNT_PUBLIC_KEY -cleos create account eosio alice $EXAMPLE_ACCOUNT_PUBLIC_KEY -cleos create account eosio bobr1 $R1_EXAMPLE_ACCOUNT_PUBLIC_KEY -cleos create account eosio alicer1 $R1_EXAMPLE_ACCOUNT_PUBLIC_KEY cleos create account eosio cfhello $CFHELLO_PUBLIC_KEY cleos create account cfhello cfactor $CFACTOR_PUBLIC_KEY # preactivate concensus upgrades post_preactivate -sleep 1s -setabi eosio $CONTRACTS_DIR/eosio.boot/eosio.boot.abi -setcode eosio $CONTRACTS_DIR/eosio.boot/eosio.boot.wasm +if [ $EOSBRANCH = "release_2.0.x" ]; then + sleep 1s + setabi eosio $CONTRACTS_DIR/eosio.bios_v1.8.3/eosio.bios.abi + setcode eosio $CONTRACTS_DIR/eosio.bios_v1.8.3/eosio.bios.wasm -sleep 1s -activate_feature "299dcb6af692324b899b39f16d5a530a33062804e41f09dc97e9f156b4476707" -activate_feature "825ee6288fb1373eab1b5187ec2f04f6eacb39cb3a97f356a07c91622dd61d16" -activate_feature "c3a6138c5061cf291310887c0b5c71fcaffeab90d5deb50d3b9e687cead45071" + sleep 1s + activate_feature "299dcb6af692324b899b39f16d5a530a33062804e41f09dc97e9f156b4476707" + + sleep 1s + setabi eosio $CONTRACTS_DIR/eosio.bios/eosio.bios.abi + setcode eosio $CONTRACTS_DIR/eosio.bios/eosio.bios.wasm + + sleep 1s +fi + +if [ $EOSBRANCH = "release_2.1.x" ] || [ $EOSBRANCH = "develop" ]; then + sleep 1s + setabi eosio $CONTRACTS_DIR/eosio.boot/eosio.boot.abi + setcode eosio $CONTRACTS_DIR/eosio.boot/eosio.boot.wasm + + sleep 1s + activate_feature "299dcb6af692324b899b39f16d5a530a33062804e41f09dc97e9f156b4476707" +fi + +if [ $EOSBRANCH = "release_2.1.x" ] || [ $EOSBRANCH = "develop" ]; then + activate_feature "825ee6288fb1373eab1b5187ec2f04f6eacb39cb3a97f356a07c91622dd61d16" + activate_feature "c3a6138c5061cf291310887c0b5c71fcaffeab90d5deb50d3b9e687cead45071" + activate_feature "bf61537fd21c61a60e542a5d66c3f6a78da0589336868307f94a82bccea84e88" + activate_feature "5443fcf88330c586bc0e5f3dee10e7f63c76c00249c87fe4fbf7f38c082006b4" +fi activate_feature "4e7bf348da00a945489b2a681749eb56f5de00b900014e137ddae39f48f69d67" activate_feature "f0af56d2c5a48d60a4a5b5c903edfb7db3a736a94ed589d0b797df33ff9d3e1d" activate_feature "2652f5f96006294109b3dd0bbde63693f55324af452b799ee137a81a905eed25" @@ -191,49 +209,80 @@ activate_feature "e0fb64b1085cc5538970158d05a009c24e276fb94e1a0bf6a528b48fbc4ff5 activate_feature "ef43112c6543b88db2283a2e077278c315ae2c84719a8b25f25cc88565fbea99" activate_feature "4a90c00d55454dc5b059055ca213579c6ea856967712a56017487886a4d4cc0f" activate_feature "1a99a59d87e06e09ec5b028a9cbb7749b4a5ad8819004365d02dc4379a8b7241" -activate_feature "bf61537fd21c61a60e542a5d66c3f6a78da0589336868307f94a82bccea84e88" -activate_feature "5443fcf88330c586bc0e5f3dee10e7f63c76c00249c87fe4fbf7f38c082006b4" +if [ $EOSBRANCH = "develop" ]; then + activate_feature "808c49387292c34ccb3970e00b08a690b6b3370c1cbcec46d46c19d5dfafab03" +fi -sleep 1s -setabi eosio $CONTRACTS_DIR/eosio.bios/eosio.bios.abi -setcode eosio $CONTRACTS_DIR/eosio.bios/eosio.bios.wasm +if [ $EOSBRANCH = "release_2.1.x" ] || [ $EOSBRANCH = "develop" ]; then + sleep 1s + setabi eosio $CONTRACTS_DIR/eosio.bios/eosio.bios.abi + setcode eosio $CONTRACTS_DIR/eosio.bios/eosio.bios.wasm -sleep 1s -cleos push action eosio setkvparams '[{"max_key_size":1024, "max_value_size":4096, "max_iterators":1024}]' -p eosio@active -cleos push action eosio setpparams '["01110000400100000000"]' -p eosio@active + sleep 1s + cleos push action eosio setkvparams '[{"max_key_size":1024, "max_value_size":4096, "max_iterators":1024}]' -p eosio@active + cleos push action eosio setpparams '["01110000400100000000"]' -p eosio@active + + sleep 1s + setabi todo $CONTRACTS_DIR/kv_todo/kv_todo.abi + setcode todo $CONTRACTS_DIR/kv_todo/kv_todo.wasm + + sleep 1s + setabi returnvalue $CONTRACTS_DIR/action_return_value/action_return_value.abi + setcode returnvalue $CONTRACTS_DIR/action_return_value/action_return_value.wasm +fi sleep 1s setabi cfhello $CONTRACTS_DIR/cfhello/cfhello.abi setcode cfhello $CONTRACTS_DIR/cfhello/cfhello.wasm +if [ $EOSBRANCH = "develop" ]; then + sleep 1s + setabi readonly $CONTRACTS_DIR/read_only_query_tests/read_only_query_tests.abi + setcode readonly $CONTRACTS_DIR/read_only_query_tests/read_only_query_tests.wasm +fi + sleep 1s -setabi todo $CONTRACTS_DIR/kv_todo/kv_todo.abi -setcode todo $CONTRACTS_DIR/kv_todo/kv_todo.wasm +setabi eosio.msig $CONTRACTS_DIR/eosio.msig/eosio.msig.abi +setcode eosio.msig $CONTRACTS_DIR/eosio.msig/eosio.msig.wasm sleep 1s -setabi returnvalue $CONTRACTS_DIR/action_return_value/action_return_value.abi -setcode returnvalue $CONTRACTS_DIR/action_return_value/action_return_value.wasm +setabi eosio $CONTRACTS_DIR/eosio.system/eosio.system.abi +setcode eosio $CONTRACTS_DIR/eosio.system/eosio.system.wasm sleep 1s setabi eosio.token $CONTRACTS_DIR/eosio.token/eosio.token.abi setcode eosio.token $CONTRACTS_DIR/eosio.token/eosio.token.wasm sleep 1s -cleos push action eosio.token create '["bob", "10000000000.0000 SYS"]' -p eosio.token -cleos push action eosio.token issue '["bob", "5000000000.0000 SYS", "Half of available supply"]' -p bob -cleos push action eosio.token transfer '["bob", "alice", "1000000.0000 SYS", "memo"]' -p bob -cleos push action eosio.token transfer '["bob", "bobr1", "1000000.0000 SYS", "memo"]' -p bob -cleos push action eosio.token transfer '["bob", "alicer1", "1000000.0000 SYS", "memo"]' -p bob +cleos push action eosio.token create '["eosio", "10000000000.0000 SYS"]' -p eosio.token +cleos push action eosio.token issue '["eosio", "5000000000.0000 SYS", "Half of available supply"]' -p eosio -cleos push action todo upsert '["bf581bee-9f2c-447b-94ad-78e4984b6f51", "todo", "Write Hello World Contract", false]' -p todo@active -cleos push action todo upsert '["b7b0d09d-a82b-44d9-b067-3bae2d02917e", "todo", "Start Blockchain", false]' -p todo@active -cleos push action todo upsert '["ac8acfe7-cd4e-4d22-8400-218b697a4517", "todo", "Deploy Hello World Contract", false]' -p todo@active +cleos push action eosio init '["0", "4,SYS"]' -p eosio@active -echo "All done initializing the blockchain" +cleos system newaccount eosio --transfer bob $EXAMPLE_ACCOUNT_PUBLIC_KEY --stake-net "10000.0000 SYS" --stake-cpu "10000.0000 SYS" --buy-ram-kbytes 8192 +cleos system newaccount eosio --transfer alice $EXAMPLE_ACCOUNT_PUBLIC_KEY --stake-net "10000.0000 SYS" --stake-cpu "10000.0000 SYS" --buy-ram-kbytes 8192 +cleos system newaccount eosio --transfer bobr1 $R1_EXAMPLE_ACCOUNT_PUBLIC_KEY --stake-net "10000.0000 SYS" --stake-cpu "10000.0000 SYS" --buy-ram-kbytes 8192 +cleos system newaccount eosio --transfer alicer1 $R1_EXAMPLE_ACCOUNT_PUBLIC_KEY --stake-net "10000.0000 SYS" --stake-cpu "10000.0000 SYS" --buy-ram-kbytes 8192 + +sleep 1s +cleos push action eosio.token transfer '["eosio", "bob", "1000.0000 SYS", "memo"]' -p eosio +cleos push action eosio.token transfer '["eosio", "alice", "1000.0000 SYS", "memo"]' -p eosio +cleos push action eosio.token transfer '["eosio", "bobr1", "1000.0000 SYS", "memo"]' -p eosio +cleos push action eosio.token transfer '["eosio", "alicer1", "1000.0000 SYS", "memo"]' -p eosio + +if [ $EOSBRANCH = "release_2.1.x" ] || [ $EOSBRANCH = "develop" ]; then + cleos push action todo upsert '["bf581bee-9f2c-447b-94ad-78e4984b6f51", "todo", "Write Hello World Contract", false]' -p todo@active + cleos push action todo upsert '["b7b0d09d-a82b-44d9-b067-3bae2d02917e", "todo", "Start Blockchain", false]' -p todo@active + cleos push action todo upsert '["ac8acfe7-cd4e-4d22-8400-218b697a4517", "todo", "Deploy Hello World Contract", false]' -p todo@active +fi -if [[ -z $NODEOS_RUNNING ]]; then - echo "Shut down Nodeos, sleeping for 2 seconds to allow time for at least 4 blocks to be created after deploying contracts" - sleep 2s - kill %1 - fg %1 +if [ $EOSBRANCH = "develop" ]; then + cleos push action readonly setup '[]' -p readonly@active fi + +echo "All done initializing the blockchain" + +echo "Shut down Nodeos, sleeping for 2 seconds to allow time for at least 4 blocks to be created after deploying contracts" +sleep 2s +kill %1 +fg %1 diff --git a/.github/workflows/build-docker-develop.yml b/.github/workflows/build-docker-develop.yml deleted file mode 100644 index 23e308f2f..000000000 --- a/.github/workflows/build-docker-develop.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Build Docker - Develop -on: - schedule: - - cron: "0 2 * * *" - -jobs: - build-docker: - name: Build Docker - Develop - runs-on: ubuntu-18.04 - steps: - - name: Checkout - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f - with: - ref: develop - token: ${{ github.token }} - - name: Set up QEMU - uses: docker/setup-qemu-action@c308fdd69d26ed66f4506ebd74b180abe5362145 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@0d135e0c2fc0dba0729c1a47ecfcf5a3c7f8579e - - name: Login to DockerHub - uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@e1b7f96249f2e4c8e4ac1519b9608c0d48944a1f - with: - context: ./.github/eosjs-ci - file: ./.github/eosjs-ci/Dockerfile - pull: true - push: true - no-cache: true - tags: | - eosio/eosjs-ci:develop - eosio/eosjs-ci:${{ github.sha }} diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml new file mode 100644 index 000000000..f2956041e --- /dev/null +++ b/.github/workflows/build-docker-images.yml @@ -0,0 +1,163 @@ +name: Build Docker Images +on: + schedule: + - cron: "0 2 * * *" + workflow_dispatch: + +jobs: + build-docker-2_0_x: + name: Build Docker - nodeos release/2.0.x + runs-on: ubuntu-18.04 + steps: + - name: Checkout + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + with: + token: ${{ github.token }} + - name: Get nodeos sha + id: nodeos + uses: actions/github-script@v3 + with: + script: | + const nodeosVersion = 'v2.0.'; + const releaseList = await github.paginate('GET /repos/eosio/eos/releases'); + const releases = releaseList.map(release => { + return { + tag: release.tag_name, + published_at: new Date(release.published_at), + }; + }) + .filter(release => release.tag.startsWith(nodeosVersion)) + .sort((a, b) => b.published_at - a.published_at); + const tagList = await github.paginate('GET /repos/eosio/eos/tags'); + const tag = tagList.filter(tag => tag.name === releases[0].tag); + return tag[0].commit.sha; + - name: Nodeos sha + id: nodeos-sha + run: | + SHA=$(echo "${NODEOS_SHA_FROM_JS}" | tr -d '"') + echo ::set-output name=NODEOS_SHA::${SHA} + env: + NODEOS_SHA_FROM_JS: ${{ steps.nodeos.outputs.result }} + - name: Set up QEMU + uses: docker/setup-qemu-action@27d0a4f181a40b142cce983c5393082c365d1480 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@0d135e0c2fc0dba0729c1a47ecfcf5a3c7f8579e + - name: Login to DockerHub + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push + uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + with: + context: ./.github/eosjs-ci + file: ./.github/eosjs-ci/Dockerfile + pull: true + push: true + no-cache: true + build-args: | + EOSBRANCH=release_2.0.x + CDTBRANCH=release_1.7.x + tags: | + bradlhart/eosjs-ci:release_2.0.x + bradlhart/eosjs-ci:${{ steps.nodeos-sha.outputs.NODEOS_SHA }} + build-docker-2_1_x: + name: Build Docker - nodeos release/2.1.x + runs-on: ubuntu-18.04 + steps: + - name: Checkout + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + with: + token: ${{ github.token }} + - name: Get nodeos sha + id: nodeos + uses: actions/github-script@v3 + with: + script: | + const nodeosVersion = 'v2.1.'; + const releaseList = await github.paginate('GET /repos/eosio/eos/releases'); + const releases = releaseList.map(release => { + return { + tag: release.tag_name, + published_at: new Date(release.published_at), + }; + }) + .filter(release => release.tag.startsWith(nodeosVersion)) + .sort((a, b) => b.published_at - a.published_at); + const tagList = await github.paginate('GET /repos/eosio/eos/tags'); + const tag = tagList.filter(tag => tag.name === releases[0].tag); + return tag[0].commit.sha; + - name: Nodeos sha + id: nodeos-sha + run: | + SHA=$(echo "${NODEOS_SHA_FROM_JS}" | tr -d '"') + echo ::set-output name=NODEOS_SHA::${SHA} + env: + NODEOS_SHA_FROM_JS: ${{ steps.nodeos.outputs.result }} + - name: Set up QEMU + uses: docker/setup-qemu-action@c308fdd69d26ed66f4506ebd74b180abe5362145 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@0d135e0c2fc0dba0729c1a47ecfcf5a3c7f8579e + - name: Login to DockerHub + uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push + uses: docker/build-push-action@e1b7f96249f2e4c8e4ac1519b9608c0d48944a1f + with: + context: ./.github/eosjs-ci + file: ./.github/eosjs-ci/Dockerfile + pull: true + push: true + no-cache: true + build-args: | + EOSBRANCH=release_2.1.x + CDTBRANCH=release_1.8.x + tags: | + bradlhart/eosjs-ci:release_2.1.x + bradlhart/eosjs-ci:${{ steps.nodeos-sha.outputs.NODEOS_SHA }} + build-docker-develop: + name: Build Docker - nodeos develop + runs-on: ubuntu-18.04 + steps: + - name: Checkout + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + with: + token: ${{ github.token }} + - name: Get nodeos sha + id: nodeos + uses: actions/github-script@v3 + with: + script: | + const nodeosVersion = 'v2.1.'; + const developRef = await github.request('GET /repos/eosio/eos/git/refs/heads/develop'); + console.log(developRef); + return developRef.data.object.sha; + - name: Nodeos sha + id: nodeos-sha + run: | + SHA=$(echo "${NODEOS_SHA_FROM_JS}" | tr -d '"') + echo ::set-output name=NODEOS_SHA::${SHA} + env: + NODEOS_SHA_FROM_JS: ${{ steps.nodeos.outputs.result }} + - name: Set up QEMU + uses: docker/setup-qemu-action@c308fdd69d26ed66f4506ebd74b180abe5362145 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@0d135e0c2fc0dba0729c1a47ecfcf5a3c7f8579e + - name: Login to DockerHub + uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push + uses: docker/build-push-action@e1b7f96249f2e4c8e4ac1519b9608c0d48944a1f + with: + context: ./.github/eosjs-ci + file: ./.github/eosjs-ci/Dockerfile + pull: true + push: true + no-cache: true + tags: | + bradlhart/eosjs-ci:develop + bradlhart/eosjs-ci:${{ steps.nodeos-sha.outputs.NODEOS_SHA }} diff --git a/.github/workflows/build-docker-release.yml b/.github/workflows/build-docker-release.yml deleted file mode 100644 index 1ab9bc528..000000000 --- a/.github/workflows/build-docker-release.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Build Docker - Release -on: - schedule: - - cron: "0 2 * * *" - -jobs: - build-docker: - name: Build Docker - Release - runs-on: ubuntu-18.04 - steps: - - name: Checkout - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f - with: - ref: release/22.0.x - token: ${{ github.token }} - - name: Set up QEMU - uses: docker/setup-qemu-action@c308fdd69d26ed66f4506ebd74b180abe5362145 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@0d135e0c2fc0dba0729c1a47ecfcf5a3c7f8579e - - name: Login to DockerHub - uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@e1b7f96249f2e4c8e4ac1519b9608c0d48944a1f - with: - context: ./.github/eosjs-ci - file: ./.github/eosjs-ci/Dockerfile - pull: true - push: true - no-cache: true - build-args: | - EOSBRANCH=release_2.1.x - CDTBRANCH=release_1.8.x - tags: | - eosio/eosjs-ci:release_22.0.x - eosio/eosjs-ci:${{ github.sha }} diff --git a/.github/workflows/integration-test-develop.yml b/.github/workflows/integration-test-develop.yml deleted file mode 100644 index c0867a5ba..000000000 --- a/.github/workflows/integration-test-develop.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: Integration Test - Develop -on: - schedule: - - cron: "0 3 * * *" - -jobs: - integration-test: - name: Integration Test - Develop - runs-on: ubuntu-18.04 - strategy: - matrix: - node-version: [15.14.0] - steps: - - name: Checkout - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f - with: - ref: develop - token: ${{ github.token }} - - name: Setup Node.js ${{ matrix.node-version }} - uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea - with: - node-version: ${{ matrix.node-version }} - registry-url: 'https://registry.npmjs.org' - - name: Install - run: | - yarn --frozen-lockfile - - name: Test - run: | - yarn test - - name: Test Node - run: | - yarn test-node - - name: Test Types - run: | - yarn test-types - - name: Build - run: | - yarn build-web - - name: Test Web - uses: cypress-io/github-action@1db146275576798796bc39ef83d739924145298a - with: - spec: cypress/integration/index.spec.js - services: - nodeos: - image: eosio/eosjs-ci:develop - - ports: - - 8888:8888 - - 9876:9876 diff --git a/.github/workflows/integration-test-release.yml b/.github/workflows/integration-test-release.yml deleted file mode 100644 index ddccc0b38..000000000 --- a/.github/workflows/integration-test-release.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: Integration Test - Release -on: - schedule: - - cron: "0 3 * * *" - -jobs: - integration-test: - name: Integration Test - Release - runs-on: ubuntu-18.04 - strategy: - matrix: - node-version: [15.14.0] - steps: - - name: Checkout - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f - with: - ref: release/22.0.x - token: ${{ github.token }} - - name: Setup Node.js ${{ matrix.node-version }} - uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea - with: - node-version: ${{ matrix.node-version }} - registry-url: 'https://registry.npmjs.org' - - name: Install - run: | - yarn --frozen-lockfile - - name: Test - run: | - yarn test - - name: Test Node - run: | - yarn test-node - - name: Test Types - run: | - yarn test-types - - name: Build - run: | - yarn build-web - - name: Test Web - uses: cypress-io/github-action@1db146275576798796bc39ef83d739924145298a - with: - spec: cypress/integration/index.spec.js - services: - nodeos: - image: eosio/eosjs-ci:release_22.0.x - - ports: - - 8888:8888 - - 9876:9876 diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml new file mode 100644 index 000000000..9cac6b221 --- /dev/null +++ b/.github/workflows/integration-tests.yml @@ -0,0 +1,385 @@ +name: Integration Tests +on: + schedule: + - cron: "0 3 * * *" + workflow_dispatch: + +jobs: + integration-test-release_21_0_x-release_2_0_x: + name: Integration Test - eosjs release/21.0.x with nodeos release/2.0.x + runs-on: ubuntu-18.04 + strategy: + matrix: + node-version: [15.14.0] + steps: + - name: Checkout + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + with: + ref: release/21.0.x + token: ${{ github.token }} + - name: Setup Node.js ${{ matrix.node-version }} + uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea + with: + node-version: ${{ matrix.node-version }} + registry-url: 'https://registry.npmjs.org' + - name: Install + run: | + yarn --frozen-lockfile + - name: Test + run: | + yarn test + - name: Test Node + run: | + yarn test-node + - name: Build + run: | + yarn build-web + - name: Test Web + uses: cypress-io/github-action@1db146275576798796bc39ef83d739924145298a + with: + spec: cypress/integration/index.spec.js + services: + nodeos: + image: bradlhart/eosjs-ci:release_2.0.x + + ports: + - 8888:8888 + - 9876:9876 + integration-test-release_21_0_x-release_2_1_x: + name: Integration Test - eosjs release/21.0.x with nodeos release/2.1.x + runs-on: ubuntu-18.04 + strategy: + matrix: + node-version: [15.14.0] + steps: + - name: Checkout + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + with: + ref: release/21.0.x + token: ${{ github.token }} + - name: Setup Node.js ${{ matrix.node-version }} + uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea + with: + node-version: ${{ matrix.node-version }} + registry-url: 'https://registry.npmjs.org' + - name: Install + run: | + yarn --frozen-lockfile + - name: Test + run: | + yarn test + - name: Test Node + run: | + yarn test-node + - name: Build + run: | + yarn build-web + - name: Test Web + uses: cypress-io/github-action@1db146275576798796bc39ef83d739924145298a + with: + spec: cypress/integration/index.spec.js + services: + nodeos: + image: bradlhart/eosjs-ci:release_2.1.x + + ports: + - 8888:8888 + - 9876:9876 + integration-test-release_21_0_x-develop: + name: Integration Test - eosjs release/21.0.x with nodeos develop + runs-on: ubuntu-18.04 + strategy: + matrix: + node-version: [15.14.0] + steps: + - name: Checkout + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + with: + ref: release/21.0.x + token: ${{ github.token }} + - name: Setup Node.js ${{ matrix.node-version }} + uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea + with: + node-version: ${{ matrix.node-version }} + registry-url: 'https://registry.npmjs.org' + - name: Install + run: | + yarn --frozen-lockfile + - name: Test + run: | + yarn test + - name: Test Node + run: | + yarn test-node + - name: Build + run: | + yarn build-web + - name: Test Web + uses: cypress-io/github-action@1db146275576798796bc39ef83d739924145298a + with: + spec: cypress/integration/index.spec.js + services: + nodeos: + image: bradlhart/eosjs-ci:develop + + ports: + - 8888:8888 + - 9876:9876 + integration-test-release_22_0_x-release_2_0_x: + name: Integration Test - eosjs release/22.0.x with nodeos release/2.0.x + runs-on: ubuntu-18.04 + strategy: + matrix: + node-version: [15.14.0] + steps: + - name: Checkout + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + with: + ref: release/22.0.x + token: ${{ github.token }} + - name: Setup Node.js ${{ matrix.node-version }} + uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea + with: + node-version: ${{ matrix.node-version }} + registry-url: 'https://registry.npmjs.org' + - name: Install + run: | + yarn --frozen-lockfile + - name: Test + run: | + yarn test + - name: Test Node + run: | + yarn test-node + env: + NODEOS_VER: 'release/2.0.x' + - name: Build + run: | + yarn build-web + - name: Test Web + uses: cypress-io/github-action@1db146275576798796bc39ef83d739924145298a + with: + spec: cypress/integration/index.spec.js + env: + CYPRESS_NODEOS_VER: 'release/2.0.x' + services: + nodeos: + image: bradlhart/eosjs-ci:release_2.0.x + + ports: + - 8888:8888 + - 9876:9876 + integration-test-release_22_0_x-release_2_1_x: + name: Integration Test - eosjs release/22.0.x with nodeos release/2.1.x + runs-on: ubuntu-18.04 + strategy: + matrix: + node-version: [15.14.0] + steps: + - name: Checkout + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + with: + ref: release/22.0.x + token: ${{ github.token }} + - name: Setup Node.js ${{ matrix.node-version }} + uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea + with: + node-version: ${{ matrix.node-version }} + registry-url: 'https://registry.npmjs.org' + - name: Install + run: | + yarn --frozen-lockfile + - name: Test + run: | + yarn test + - name: Test Node + run: | + yarn test-node + - name: Test Types + run: | + yarn test-types + - name: Build + run: | + yarn build-web + - name: Test Web + uses: cypress-io/github-action@1db146275576798796bc39ef83d739924145298a + with: + spec: cypress/integration/index.spec.js + services: + nodeos: + image: bradlhart/eosjs-ci:release_2.1.x + + ports: + - 8888:8888 + - 9876:9876 + integration-test-release_22_0_x-develop: + name: Integration Test - eosjs release/22.0.x with nodeos develop + runs-on: ubuntu-18.04 + strategy: + matrix: + node-version: [15.14.0] + steps: + - name: Checkout + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + with: + ref: release/22.0.x + token: ${{ github.token }} + - name: Setup Node.js ${{ matrix.node-version }} + uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea + with: + node-version: ${{ matrix.node-version }} + registry-url: 'https://registry.npmjs.org' + - name: Install + run: | + yarn --frozen-lockfile + - name: Test + run: | + yarn test + - name: Test Node + run: | + yarn test-node + - name: Build + run: | + yarn build-web + - name: Test Web + uses: cypress-io/github-action@1db146275576798796bc39ef83d739924145298a + with: + spec: cypress/integration/index.spec.js + services: + nodeos: + image: bradlhart/eosjs-ci:develop + + ports: + - 8888:8888 + - 9876:9876 + integration-test-develop-release_2_0_x: + name: Integration Test - eosjs develop with nodeos release/2.0.x + runs-on: ubuntu-18.04 + strategy: + matrix: + node-version: [15.14.0] + steps: + - name: Checkout + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + with: + ref: develop + token: ${{ github.token }} + - name: Setup Node.js ${{ matrix.node-version }} + uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea + with: + node-version: ${{ matrix.node-version }} + registry-url: 'https://registry.npmjs.org' + - name: Install + run: | + yarn --frozen-lockfile + - name: Test + run: | + yarn test + - name: Test Node + run: | + yarn test-node + env: + NODEOS_VER: 'release/2.0.x' + - name: Build + run: | + yarn build-web + - name: Test Web + uses: cypress-io/github-action@1db146275576798796bc39ef83d739924145298a + with: + spec: cypress/integration/index.spec.js + env: + CYPRESS_NODEOS_VER: 'release/2.0.x' + services: + nodeos: + image: bradlhart/eosjs-ci:release_2.0.x + + ports: + - 8888:8888 + - 9876:9876 + integration-test-develop-release_2_1_x: + name: Integration Test - eosjs develop with nodeos release/2.1.x + runs-on: ubuntu-18.04 + strategy: + matrix: + node-version: [15.14.0] + steps: + - name: Checkout + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + with: + ref: develop + token: ${{ github.token }} + - name: Setup Node.js ${{ matrix.node-version }} + uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea + with: + node-version: ${{ matrix.node-version }} + registry-url: 'https://registry.npmjs.org' + - name: Install + run: | + yarn --frozen-lockfile + - name: Test + run: | + yarn test + - name: Test Node + run: | + yarn test-node + env: + NODEOS_VER: 'release/2.1.x' + - name: Build + run: | + yarn build-web + - name: Test Web + uses: cypress-io/github-action@1db146275576798796bc39ef83d739924145298a + with: + spec: cypress/integration/index.spec.js + env: + CYPRESS_NODEOS_VER: 'release/2.1.x' + services: + nodeos: + image: bradlhart/eosjs-ci:release_2.1.x + + ports: + - 8888:8888 + - 9876:9876 + integration-test-develop-develop: + name: Integration Test - eosjs develop with nodeos develop + runs-on: ubuntu-18.04 + strategy: + matrix: + node-version: [15.14.0] + steps: + - name: Checkout + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + with: + ref: develop + token: ${{ github.token }} + - name: Setup Node.js ${{ matrix.node-version }} + uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea + with: + node-version: ${{ matrix.node-version }} + registry-url: 'https://registry.npmjs.org' + - name: Install + run: | + yarn --frozen-lockfile + - name: Test + run: | + yarn test + - name: Test Node + run: | + yarn test-node + - name: Test Types + run: | + yarn test-types + - name: Build + run: | + yarn build-web + - name: Test Web + uses: cypress-io/github-action@1db146275576798796bc39ef83d739924145298a + with: + spec: cypress/integration/index.spec.js + services: + nodeos: + image: bradlhart/eosjs-ci:develop + + ports: + - 8888:8888 + - 9876:9876 From 74e88f0382d20ce7a1d96e0fabd166520aba7e61 Mon Sep 17 00:00:00 2001 From: Bradley Hart Date: Thu, 8 Jul 2021 02:50:58 -0400 Subject: [PATCH 2/2] replacing personal user account --- .github/workflows/build-docker-images.yml | 12 ++++++------ .github/workflows/integration-tests.yml | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml index f2956041e..ab9629630 100644 --- a/.github/workflows/build-docker-images.yml +++ b/.github/workflows/build-docker-images.yml @@ -59,8 +59,8 @@ jobs: EOSBRANCH=release_2.0.x CDTBRANCH=release_1.7.x tags: | - bradlhart/eosjs-ci:release_2.0.x - bradlhart/eosjs-ci:${{ steps.nodeos-sha.outputs.NODEOS_SHA }} + eosio/eosjs-ci:release_2.0.x + eosio/eosjs-ci:${{ steps.nodeos-sha.outputs.NODEOS_SHA }} build-docker-2_1_x: name: Build Docker - nodeos release/2.1.x runs-on: ubuntu-18.04 @@ -115,8 +115,8 @@ jobs: EOSBRANCH=release_2.1.x CDTBRANCH=release_1.8.x tags: | - bradlhart/eosjs-ci:release_2.1.x - bradlhart/eosjs-ci:${{ steps.nodeos-sha.outputs.NODEOS_SHA }} + eosio/eosjs-ci:release_2.1.x + eosio/eosjs-ci:${{ steps.nodeos-sha.outputs.NODEOS_SHA }} build-docker-develop: name: Build Docker - nodeos develop runs-on: ubuntu-18.04 @@ -159,5 +159,5 @@ jobs: push: true no-cache: true tags: | - bradlhart/eosjs-ci:develop - bradlhart/eosjs-ci:${{ steps.nodeos-sha.outputs.NODEOS_SHA }} + eosio/eosjs-ci:develop + eosio/eosjs-ci:${{ steps.nodeos-sha.outputs.NODEOS_SHA }} diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 9cac6b221..b5f6e0e4f 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -40,7 +40,7 @@ jobs: spec: cypress/integration/index.spec.js services: nodeos: - image: bradlhart/eosjs-ci:release_2.0.x + image: eosio/eosjs-ci:release_2.0.x ports: - 8888:8888 @@ -80,7 +80,7 @@ jobs: spec: cypress/integration/index.spec.js services: nodeos: - image: bradlhart/eosjs-ci:release_2.1.x + image: eosio/eosjs-ci:release_2.1.x ports: - 8888:8888 @@ -120,7 +120,7 @@ jobs: spec: cypress/integration/index.spec.js services: nodeos: - image: bradlhart/eosjs-ci:develop + image: eosio/eosjs-ci:develop ports: - 8888:8888 @@ -164,7 +164,7 @@ jobs: CYPRESS_NODEOS_VER: 'release/2.0.x' services: nodeos: - image: bradlhart/eosjs-ci:release_2.0.x + image: eosio/eosjs-ci:release_2.0.x ports: - 8888:8888 @@ -207,7 +207,7 @@ jobs: spec: cypress/integration/index.spec.js services: nodeos: - image: bradlhart/eosjs-ci:release_2.1.x + image: eosio/eosjs-ci:release_2.1.x ports: - 8888:8888 @@ -247,7 +247,7 @@ jobs: spec: cypress/integration/index.spec.js services: nodeos: - image: bradlhart/eosjs-ci:develop + image: eosio/eosjs-ci:develop ports: - 8888:8888 @@ -291,7 +291,7 @@ jobs: CYPRESS_NODEOS_VER: 'release/2.0.x' services: nodeos: - image: bradlhart/eosjs-ci:release_2.0.x + image: eosio/eosjs-ci:release_2.0.x ports: - 8888:8888 @@ -335,7 +335,7 @@ jobs: CYPRESS_NODEOS_VER: 'release/2.1.x' services: nodeos: - image: bradlhart/eosjs-ci:release_2.1.x + image: eosio/eosjs-ci:release_2.1.x ports: - 8888:8888 @@ -378,7 +378,7 @@ jobs: spec: cypress/integration/index.spec.js services: nodeos: - image: bradlhart/eosjs-ci:develop + image: eosio/eosjs-ci:develop ports: - 8888:8888