From 7a721f8094e264417aa8519ca90e68f2b23aeebc Mon Sep 17 00:00:00 2001 From: serkixenos <70147861+serkixenos@users.noreply.github.com> Date: Sun, 18 Oct 2020 19:18:59 +0200 Subject: [PATCH 1/3] Gitlab will build Debug and Release versions --- .gitlab-ci.yml | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1403ba24..2d27e091 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,15 +17,24 @@ build: - git submodule update --init --recursive - rm -rf build - mkdir build - - cd build - - cmake .. + - mkdir build/debug + - mkdir build/release + - cd build/debug + - cmake -DCMAKE_BUILD_TYPE=Debug ../.. + - make -j$(nproc) + - cd ../.. + - cd build/release + - cmake -DCMAKE_BUILD_TYPE=Release ../.. - make -j$(nproc) artifacts: untracked: true paths: - - build/libraries/ - - build/programs/ - - build/tests/ + - build/debug/libraries/ + - build/debug/programs/ + - build/debug/tests/ + - build/release/libraries/ + - build/release/programs/ + - build/release/tests/ tags: - builder @@ -34,8 +43,11 @@ test: dependencies: - build script: - - ./build/tests/betting_test --log_level=message - - ./build/tests/chain_test --log_level=message - - ./build/tests/cli_test --log_level=message + - ./build/debug/tests/betting_test --log_level=message + - ./build/debug/tests/chain_test --log_level=message + - ./build/debug/tests/cli_test --log_level=message + - ./build/release/tests/betting_test --log_level=message + - ./build/release/tests/chain_test --log_level=message + - ./build/release/tests/cli_test --log_level=message tags: - builder From 854cc412b3584e57466a390dec075c21c621adc9 Mon Sep 17 00:00:00 2001 From: Serki Date: Sun, 18 Oct 2020 23:11:26 +0200 Subject: [PATCH 2/3] Revert "Gitlab will build Debug and Release versions" This reverts commit 7a721f8094e264417aa8519ca90e68f2b23aeebc. --- .gitlab-ci.yml | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d27e091..1403ba24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,24 +17,15 @@ build: - git submodule update --init --recursive - rm -rf build - mkdir build - - mkdir build/debug - - mkdir build/release - - cd build/debug - - cmake -DCMAKE_BUILD_TYPE=Debug ../.. - - make -j$(nproc) - - cd ../.. - - cd build/release - - cmake -DCMAKE_BUILD_TYPE=Release ../.. + - cd build + - cmake .. - make -j$(nproc) artifacts: untracked: true paths: - - build/debug/libraries/ - - build/debug/programs/ - - build/debug/tests/ - - build/release/libraries/ - - build/release/programs/ - - build/release/tests/ + - build/libraries/ + - build/programs/ + - build/tests/ tags: - builder @@ -43,11 +34,8 @@ test: dependencies: - build script: - - ./build/debug/tests/betting_test --log_level=message - - ./build/debug/tests/chain_test --log_level=message - - ./build/debug/tests/cli_test --log_level=message - - ./build/release/tests/betting_test --log_level=message - - ./build/release/tests/chain_test --log_level=message - - ./build/release/tests/cli_test --log_level=message + - ./build/tests/betting_test --log_level=message + - ./build/tests/chain_test --log_level=message + - ./build/tests/cli_test --log_level=message tags: - builder From a9afe474a21c35b80bc7fb522778cd5a37747667 Mon Sep 17 00:00:00 2001 From: Serki Date: Sun, 18 Oct 2020 23:12:39 +0200 Subject: [PATCH 3/3] Gitlab will build Release version only --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1403ba24..da6baf86 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ build: - rm -rf build - mkdir build - cd build - - cmake .. + - cmake -DCMAKE_BUILD_TYPE=Release .. - make -j$(nproc) artifacts: untracked: true