Skip to content

add version-2-2 testing #4008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
narimiran wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add version-2-2 testing #4008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/shared/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ runs:
echo "nimbus_build_system=$nbsHash" >> $GITHUB_OUTPUT

- name: Restore prebuilt Nim from cache
if: inputs.nim-cache == 'true'
if: inputs.nim-cache == 'true' && matrix.branch == null
id: nim-cache
uses: actions/cache@v5
with:
Expand All @@ -149,7 +149,7 @@ runs:
if: inputs.nim-cache == 'true'
shell: bash
run: |
make -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinCache init
make -j${ncpu} NIM_COMMIT=${{ matrix.branch }} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinCache init

- name: Get latest nim-rocksdb commit hash
if: inputs.rocksdb-cache == 'true'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
run:
shell: bash

name: '${{ matrix.os }}-${{ matrix.cpu }}'
name: ${{ matrix.os }}-${{ matrix.cpu }}${{ matrix.branch != '' && ' (Nim ' || '' }}${{ matrix.branch-short }}${{ matrix.branch != '' && ')' || '' }}
runs-on: ${{ matrix.builder }}
steps:
- name: Checkout nimbus-eth1
Expand All @@ -82,6 +82,7 @@ jobs:

- name: Run nimbus-eth1 tests
run: |
./env.sh nim --version
gcc --version
#export ZERO_AR_DATE=1 # avoid timestamps in binaries
DEFAULT_MAKE_FLAGS="-j${ncpu} ROCKSDB_CI_CACHE=RocksBinCache"
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/matrix_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@
"cpu": "amd64",
"builder": "ubuntu-22.04"
},
{
"os": "linux",
"cpu": "amd64",
"branch": "upstream/version-2-2",
"branch-short": "version-2-2",
"builder": "ubuntu-22.04"
},
{
"os": "linux",
"cpu": "arm64",
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/nimbus_verified_proxy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
run:
shell: bash

name: '${{ matrix.os }}-${{ matrix.cpu }}'
name: ${{ matrix.os }}-${{ matrix.cpu }}${{ matrix.branch != '' && ' (Nim ' || '' }}${{ matrix.branch-short }}${{ matrix.branch != '' && ')' || '' }}
runs-on: ${{ matrix.builder }}
steps:
- name: Checkout nimbus-eth1
Expand All @@ -109,11 +109,12 @@ jobs:

- name: Build and Run tests
run: |
./env.sh nim --version
gcc --version
DEFAULT_MAKE_FLAGS="-j${ncpu}"
make ${DEFAULT_MAKE_FLAGS} nimbus_verified_proxy
make ${DEFAULT_MAKE_FLAGS} NIM_COMMIT=${{ matrix.branch }} nimbus_verified_proxy
build/nimbus_verified_proxy --help
# "-static" option will not work for osx unless static system libraries are provided
make ${DEFAULT_MAKE_FLAGS} nimbus_verified_proxy_test
make ${DEFAULT_MAKE_FLAGS} libverifproxy_test
make ${DEFAULT_MAKE_FLAGS} nimbus_verified_proxy_go_test
make ${DEFAULT_MAKE_FLAGS} NIM_COMMIT=${{ matrix.branch }} nimbus_verified_proxy_test
make ${DEFAULT_MAKE_FLAGS} NIM_COMMIT=${{ matrix.branch }} libverifproxy_test
make ${DEFAULT_MAKE_FLAGS} NIM_COMMIT=${{ matrix.branch }} nimbus_verified_proxy_go_test
22 changes: 13 additions & 9 deletions .github/workflows/portal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,12 @@ concurrency: # Cancel stale PR builds (but not push builds)
cancel-in-progress: true

jobs:
matrix_config:
uses: ./.github/workflows/matrix_config.yml

# separate job so it can run concurrently with other tests
testutp:
needs: matrix_config
# whole test setup runs on ubuntu so we do not need multiple arch setup here
runs-on: ubuntu-22.04
# TODO: for now only push event as this way it is easier to get branch name
Expand Down Expand Up @@ -69,6 +73,7 @@ jobs:
echo "nimbus_build_system=$nbsHash" >> $GITHUB_OUTPUT

- name: Restore prebuilt Nim binaries from cache
if: matrix.branch == null
id: nim-cache
uses: actions/cache@v5
with:
Expand All @@ -77,7 +82,7 @@ jobs:

- name: Build Nim and Nimbus-eth1 dependencies
run: |
make -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinaries init
make -j${ncpu} NIM_COMMIT=${{ matrix.branch }} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinaries init

- name: build uTP test app container
run: |
Expand Down Expand Up @@ -109,9 +114,6 @@ jobs:
PATH=$PATH$(find /usr/libexec/docker -name docker-compose -printf ":%h")
docker-compose -f portal/tools/utp_testing/docker/docker-compose.yml down

matrix_config:
uses: ./.github/workflows/matrix_config.yml

build:
needs: matrix_config

Expand All @@ -123,7 +125,7 @@ jobs:
run:
shell: bash

name: '${{ matrix.os }}-${{ matrix.cpu }}'
name: ${{ matrix.os }}-${{ matrix.cpu }}${{ matrix.branch != '' && ' (Nim ' || '' }}${{ matrix.branch-short }}${{ matrix.branch != '' && ')' || '' }}
runs-on: ${{ matrix.builder }}
steps:
- name: Checkout nimbus-eth1
Expand All @@ -140,6 +142,7 @@ jobs:
- name: Run Nimbus Portal tests (Windows)
if: runner.os == 'Windows'
run: |
./env.sh nim --version
gcc --version
DEFAULT_MAKE_FLAGS="-j${ncpu}"
mingw32-make ${DEFAULT_MAKE_FLAGS} nimbus_portal_client
Expand All @@ -154,20 +157,21 @@ jobs:
- name: Run Nimbus Portal tests (Linux)
if: runner.os == 'Linux'
run: |
./env.sh nim --version
gcc --version
./env.sh nim -v
ldd --version
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib"
DEFAULT_MAKE_FLAGS="-j${ncpu}"
env CC=gcc make ${DEFAULT_MAKE_FLAGS} nimbus_portal_client
env CC=gcc make ${DEFAULT_MAKE_FLAGS} NIM_COMMIT=${{ matrix.branch }} nimbus_portal_client
build/nimbus_portal_client --help
env CC=gcc make ${DEFAULT_MAKE_FLAGS} portal-tools
env CC=gcc make ${DEFAULT_MAKE_FLAGS} NIM_COMMIT=${{ matrix.branch }} portal-tools
# CC is needed to select correct compiler 32/64 bit
env CC=gcc CXX=g++ make ${DEFAULT_MAKE_FLAGS} portal-test
env CC=gcc CXX=g++ make ${DEFAULT_MAKE_FLAGS} NIM_COMMIT=${{ matrix.branch }} portal-test

- name: Run Nimbus Portal tests (Macos)
if: runner.os == 'Macos'
run: |
./env.sh nim --version
DEFAULT_MAKE_FLAGS="-j${ncpu}"
make ${DEFAULT_MAKE_FLAGS} nimbus_portal_client
build/nimbus_portal_client --help
Expand Down
Loading