From 249caaa7ff3c30164a586ceaf2f806cee6da1a26 Mon Sep 17 00:00:00 2001 From: tangxifan Date: Wed, 10 May 2023 13:24:01 +0800 Subject: [PATCH] [script] serialize make all depedent targets to avoid ``make all`` bugs --- .github/workflows/build.yml | 35 +++++------------------------------ Makefile | 2 +- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4017fcaf5..e0cd7bc71 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -127,15 +127,10 @@ jobs: - uses: hendrikmuhs/ccache-action@v1 - - name: checkout submodules - shell: bash - run: | - make checkout - - name: Build shell: bash run: | - make compile BUILD_TYPE=$BUILD_TYPE + make all BUILD_TYPE=$BUILD_TYPE # Check the cache size and see if it is over the limit - name: Check ccache size @@ -216,15 +211,10 @@ jobs: - uses: hendrikmuhs/ccache-action@v1 - - name: checkout submodules - shell: bash - run: | - make checkout - - name: Build shell: bash run: | - make compile BUILD_TYPE=$BUILD_TYPE CMAKE_FLAGS="${{ matrix.config.cmake_flags }}" + make all BUILD_TYPE=$BUILD_TYPE CMAKE_FLAGS="${{ matrix.config.cmake_flags }}" ubuntu_support: needs: change_detect @@ -262,15 +252,10 @@ jobs: - uses: hendrikmuhs/ccache-action@v1 - - name: checkout submodules - shell: bash - run: | - make checkout - - name: Build shell: bash run: | - make compile BUILD_TYPE=$BUILD_TYPE + make all BUILD_TYPE=$BUILD_TYPE debug_build: needs: change_detect @@ -315,15 +300,10 @@ jobs: - uses: hendrikmuhs/ccache-action@v1 - - name: checkout submodules - shell: bash - run: | - make checkout - - name: Build shell: bash run: | - make compile BUILD_TYPE=${{ matrix.config.build_type }} -j ${{ matrix.config.cores }} + make all BUILD_TYPE=${{ matrix.config.build_type }} -j ${{ matrix.config.cores }} - name: Quick Test shell: bash @@ -371,15 +351,10 @@ jobs: - uses: hendrikmuhs/ccache-action@v1 - - name: checkout submodules - shell: bash - run: | - make checkout - - name: Build shell: bash run: | - make compile BUILD_TYPE=${{ matrix.config.build_type }} -j ${{ matrix.config.cores }} CMAKE_FLAGS="-DOPENFPGA_ENABLE_STRICT_COMPILE=ON" + make all BUILD_TYPE=${{ matrix.config.build_type }} -j ${{ matrix.config.cores }} CMAKE_FLAGS="-DOPENFPGA_ENABLE_STRICT_COMPILE=ON" - name: Quick Test shell: bash diff --git a/Makefile b/Makefile index db960eb5b..d06031cf9 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ list_cmake_targets: prebuild # Show the targets available to be built, which can be specified through ``CMAKE_GOALS`` when compile cd ${BUILD_DIR} && make help && cd - -all: checkout compile +all: checkout | compile # A shortcut command to run checkout and compile in serial format-cpp: