update to supported macOS in Github CI

This commit is contained in:
jangko 2022-07-28 09:19:57 +07:00
parent a1253c67bd
commit 2c0a8fa26d
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
4 changed files with 11 additions and 6 deletions

View File

@ -68,7 +68,7 @@ jobs:
shell: bash shell: bash
- target: - target:
os: macos os: macos
builder: macos-10.15 builder: macos-11
shell: bash shell: bash
- target: - target:
os: windows os: windows
@ -257,12 +257,12 @@ jobs:
id: nim-cache id: nim-cache
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: NimBinaries path: NimBinCache
key: 'nim-${{ matrix.target.os }}-${{ matrix.target.cpu }}-${{ steps.versions.outputs.nimbus_build_system }}' key: 'nim-${{ matrix.target.os }}-${{ matrix.target.cpu }}-${{ steps.versions.outputs.nimbus_build_system }}'
- name: Build Nim and Nimbus-eth1 dependencies - name: Build Nim and Nimbus-eth1 dependencies
run: | run: |
make -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinaries update make -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinCache update
- name: Run nimbus-eth1 tests (Windows) - name: Run nimbus-eth1 tests (Windows)
if: runner.os == 'Windows' if: runner.os == 'Windows'

View File

@ -114,7 +114,7 @@ jobs:
shell: bash shell: bash
- target: - target:
os: macos os: macos
builder: macos-10.15 builder: macos-11
shell: bash shell: bash
- target: - target:
os: windows os: windows

View File

@ -51,7 +51,7 @@ jobs:
build-macos-amd64: build-macos-amd64:
name: Macos-amd64 name: Macos-amd64
runs-on: macos-10.15 runs-on: macos-11
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2

View File

@ -7,12 +7,17 @@ USE_SYSTEM_NIM=1
ENV_SCRIPT="vendor/nimbus-build-system/scripts/env.sh" ENV_SCRIPT="vendor/nimbus-build-system/scripts/env.sh"
# nimbus_db_backend:none -> we only use memory db in simulators # nimbus_db_backend:none -> we only use memory db in simulators
NIM_FLAGS="c -r -d:release -d:disable_libbacktrace -d:nimbus_db_backend:none" NIM_FLAGS="c -d:release -d:disable_libbacktrace -d:nimbus_db_backend:none"
${ENV_SCRIPT} nim ${NIM_FLAGS} ${SIM_DIR}/engine/engine_sim ${ENV_SCRIPT} nim ${NIM_FLAGS} ${SIM_DIR}/engine/engine_sim
${ENV_SCRIPT} nim ${NIM_FLAGS} ${SIM_DIR}/consensus/consensus_sim ${ENV_SCRIPT} nim ${NIM_FLAGS} ${SIM_DIR}/consensus/consensus_sim
${ENV_SCRIPT} nim ${NIM_FLAGS} ${SIM_DIR}/graphql/graphql_sim ${ENV_SCRIPT} nim ${NIM_FLAGS} ${SIM_DIR}/graphql/graphql_sim
${ENV_SCRIPT} nim ${NIM_FLAGS} ${SIM_DIR}/rpc/rpc_sim ${ENV_SCRIPT} nim ${NIM_FLAGS} ${SIM_DIR}/rpc/rpc_sim
${SIM_DIR}/engine/engine_sim
${SIM_DIR}/consensus/consensus_sim
${SIM_DIR}/graphql/graphql_sim
${SIM_DIR}/rpc/rpc_sim
echo "## ${1}" > simulators.md echo "## ${1}" > simulators.md
cat engine.md consensus.md graphql.md rpc.md >> simulators.md cat engine.md consensus.md graphql.md rpc.md >> simulators.md