From 8520290a1355737647365d926627954a146da9e3 Mon Sep 17 00:00:00 2001 From: Stepan Usatiuk Date: Sun, 14 Jul 2024 22:34:25 +0200 Subject: [PATCH] CI: remove build parallel --- .github/workflows/ficus.yml | 3 +-- .github/workflows/unit.yml | 7 +++---- ficus-toolchain/buildenv.sh | 10 ++-------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ficus.yml b/.github/workflows/ficus.yml index 05ec2ff79..e9c8923d1 100644 --- a/.github/workflows/ficus.yml +++ b/.github/workflows/ficus.yml @@ -8,7 +8,6 @@ on: env: BUILD_TYPE: Debug - BUILD_PARALLEL: 3 jobs: build-generic-toolchain: @@ -118,7 +117,7 @@ jobs: - name: Build iso # Build your program with the given configuration - run: source ${{github.workspace}}/env.sh && cmake --build ${{github.workspace}}/build --target iso --config ${{env.BUILD_TYPE}} --parallel ${{env.BUILD_PARALLEL}} + run: source ${{github.workspace}}/env.sh && cmake --build ${{github.workspace}}/build --target iso --config ${{env.BUILD_TYPE}} --parallel $(nproc) - name: Upload isos uses: actions/upload-artifact@v3 diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index eac266074..690a6f505 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -2,15 +2,14 @@ name: Unit tests on: push: - branches: [ "main" ] + branches: ["main"] pull_request: - branches: [ "main" ] + branches: ["main"] env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Debug TEST_MODE: UNIT - BUILD_PARALLEL: 3 jobs: build: @@ -35,7 +34,7 @@ jobs: - name: Build # Build your program with the given configuration - run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel ${{env.BUILD_PARALLEL}} + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $(nproc) - name: Test # Execute tests defined by the CMake configuration. diff --git a/ficus-toolchain/buildenv.sh b/ficus-toolchain/buildenv.sh index f88c98e1b..b43787f2d 100755 --- a/ficus-toolchain/buildenv.sh +++ b/ficus-toolchain/buildenv.sh @@ -1,19 +1,13 @@ #!/bin/bash if [ -z "$FICUS_ROOT" ]; then - echo "$FICUS_ROOT" is blank + echo "$FICUS_ROOT" is blank fi export PREFIX="$FICUS_ROOT/toolchain/gcc-x86_64-ficus-prefix/" export TARGET=x86_64-ficus export PATH="$PREFIX/bin:$PATH" -if [ -z "${BUILD_PARALLEL}" ] -then +if [ -z "${BUILD_PARALLEL}" ]; then export BUILD_PARALLEL=$(nproc) fi - -if [ -z "${BUILD_PARALLEL}" ] -then - export BUILD_PARALLEL=$BUILD_PARALLEL -fi