dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix build type in Docker (#4249)

Browse source
This commit is contained in:
Piotr Wójcik 2023-06-22 16:14:02 +02:00 • committed by GitHub
commit 54593ee2a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/unit_tests.yml vendored
View file

@ -13,7 +13,7 @@ jobs:
- ${{ startsWith(github.ref, 'refs/tags/') }} - ${{ startsWith(github.ref, 'refs/tags/') }}
env: env:
BACKEND: ${{ matrix.BACKEND }} BACKEND: ${{ matrix.BACKEND }}
RELEASE: ${{ matrix.RELEASE }} BUILD_TYPE: ${{ matrix.RELEASE && 'RelWithDebInfo' || 'Debug' }}
TEST_USE_ROCKSDB: ${{ matrix.BACKEND == 'rocksdb' && '1' || '0' }} TEST_USE_ROCKSDB: ${{ matrix.BACKEND == 'rocksdb' && '1' || '0' }}
DEADLINE_SCALE_FACTOR: ${{ matrix.BACKEND == 'rocksdb' && '2' || '1' }} DEADLINE_SCALE_FACTOR: ${{ matrix.BACKEND == 'rocksdb' && '2' || '1' }}
runs-on: macos-12 runs-on: macos-12
@ -78,7 +78,7 @@ jobs:
env: env:
COMPILER: ${{ matrix.COMPILER }} COMPILER: ${{ matrix.COMPILER }}
BACKEND: ${{ matrix.BACKEND }} BACKEND: ${{ matrix.BACKEND }}
RELEASE: ${{ matrix.RELEASE }} BUILD_TYPE: ${{ matrix.RELEASE && 'RelWithDebInfo' || 'Debug' }}
TEST_USE_ROCKSDB: ${{ matrix.BACKEND == 'rocksdb' && '1' || '0' }} TEST_USE_ROCKSDB: ${{ matrix.BACKEND == 'rocksdb' && '1' || '0' }}
DEADLINE_SCALE_FACTOR: ${{ matrix.BACKEND == 'rocksdb' && '2' || '1' }} DEADLINE_SCALE_FACTOR: ${{ matrix.BACKEND == 'rocksdb' && '2' || '1' }}
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
@ -144,8 +144,9 @@ jobs:
runs-on: windows-latest runs-on: windows-latest
env: env:
BACKEND: ${{ matrix.BACKEND }} BACKEND: ${{ matrix.BACKEND }}
RELEASE: ${{ matrix.RELEASE }} BUILD_TYPE: ${{ matrix.RELEASE && 'RelWithDebInfo' || 'Debug' }}
TEST_USE_ROCKSDB: ${{ matrix.BACKEND == 'rocksdb' && '1' || '0' }} TEST_USE_ROCKSDB: ${{ matrix.BACKEND == 'rocksdb' && '1' || '0' }}
DEADLINE_SCALE_FACTOR: ${{ matrix.BACKEND == 'rocksdb' && '2' || '1' }}
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
steps: steps:
- name: Checkout - name: Checkout

6
ci/build-tests.sh
View file

@ -1,12 +1,6 @@
#!/bin/bash #!/bin/bash
set -euox pipefail set -euox pipefail
BUILD_TYPE="Debug"
if [[ "${RELEASE:-false}" == "true" ]]; then
BUILD_TYPE="RelWithDebInfo"
fi
BUILD_TYPE=$BUILD_TYPE \
NANO_TEST=ON \ NANO_TEST=ON \
NANO_NETWORK=dev \ NANO_NETWORK=dev \
NANO_GUI=ON \ NANO_GUI=ON \

2
docker/node/Dockerfile
View file

@ -1,6 +1,8 @@
FROM ubuntu:22.04 as builder FROM ubuntu:22.04 as builder
ARG COMPILER=gcc ARG COMPILER=gcc
ARG BUILD_TYPE=RelWithDebInfo
ARG SANITIZER
ARG NANO_NETWORK=live ARG NANO_NETWORK=live
ARG CI_TAG=DEV_BUILD ARG CI_TAG=DEV_BUILD
ARG CI_BUILD=OFF ARG CI_BUILD=OFF