From c3e640bfaf279486e23a1c25d8b0f46032710f33 Mon Sep 17 00:00:00 2001 From: kreuzerkrieg Date: Thu, 16 Dec 2021 12:53:02 +0200 Subject: [PATCH 1/2] stop trying to add `-j` to the variable, it simply doesnt work --- debian/rules | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/debian/rules b/debian/rules index 4562d24bec4..62081704e92 100755 --- a/debian/rules +++ b/debian/rules @@ -77,10 +77,6 @@ else THREADS_COUNT = 1 endif -ifneq ($(THREADS_COUNT),) - THREADS_COUNT:=-j$(THREADS_COUNT) -endif - %: dh $@ $(DH_FLAGS) --buildsystem=cmake @@ -89,11 +85,11 @@ override_dh_auto_configure: override_dh_auto_build: # Fix for ninja. Do not add -O. - $(MAKE) $(THREADS_COUNT) -C $(BUILDDIR) $(MAKE_TARGET) + $(MAKE) -j$(THREADS_COUNT) -C $(BUILDDIR) $(MAKE_TARGET) override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - cd $(BUILDDIR) && ctest $(THREADS_COUNT) -V + cd $(BUILDDIR) && ctest -j$(THREADS_COUNT) -V endif override_dh_clean: @@ -120,7 +116,7 @@ override_dh_install: dh_install --list-missing --sourcedir=$(DESTDIR) override_dh_auto_install: - env DESTDIR=$(DESTDIR) $(MAKE) $(THREADS_COUNT) -C $(BUILDDIR) install + env DESTDIR=$(DESTDIR) $(MAKE) -j$(THREADS_COUNT) -C $(BUILDDIR) install override_dh_shlibdeps: true # We depend only on libc and dh_shlibdeps gives us wrong (too strict) dependency. From e95cf9e5caf5905048831ad598c4a256e11062f8 Mon Sep 17 00:00:00 2001 From: alesapin Date: Thu, 16 Dec 2021 18:45:44 +0300 Subject: [PATCH 2/2] Followup --- .github/workflows/docs_check.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs_check.yml b/.github/workflows/docs_check.yml index 5f860e52ec1..da2f98c9fb3 100644 --- a/.github/workflows/docs_check.yml +++ b/.github/workflows/docs_check.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Clear repository run: | - sudo rm -rf $GITHUB_WORKSPACE + sudo rm -rf $GITHUB_WORKSPACE && mkdir $GITHUB_WORKSPACE - name: Check out repository code uses: actions/checkout@v2 - name: Labels check @@ -29,7 +29,7 @@ jobs: steps: - name: Clear repository run: | - sudo rm -rf $GITHUB_WORKSPACE + sudo rm -rf $GITHUB_WORKSPACE && mkdir $GITHUB_WORKSPACE - name: Check out repository code uses: actions/checkout@v2 - name: Images check @@ -58,7 +58,7 @@ jobs: path: ${{ env.TEMP_PATH }} - name: Clear repository run: | - sudo rm -rf $GITHUB_WORKSPACE + sudo rm -rf $GITHUB_WORKSPACE && mkdir $GITHUB_WORKSPACE - name: Check out repository code uses: actions/checkout@v2 - name: Docs Check