Skip to content

Commit facd13b

Browse files
committed
fix: optimize make commands for parallel execution in GitHub Actions and Makefile
1 parent c165acb commit facd13b

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ jobs:
4646
defaults:
4747
run:
4848
shell: bash
49-
env:
50-
MAKEFLAGS: -j 8
5149

5250
steps:
5351

@@ -63,11 +61,11 @@ jobs:
6361
6462
- name: windows build curl
6563
if: matrix.os == 'windows-latest'
66-
run: make curl/windows/libcurl.a
64+
run: make curl/windows/libcurl.a -j4
6765
shell: msys2 {0}
6866

6967
- name: build sqlite-sync
70-
run: make ${{ matrix.make && matrix.make || ''}}
68+
run: make extension ${{ matrix.make && matrix.make || ''}} -j4
7169

7270
- name: windows install sqlite3
7371
if: matrix.os == 'windows-latest'
@@ -97,7 +95,7 @@ jobs:
9795
echo "::endgroup::"
9896
9997
echo "::group::prepare the test script"
100-
make test PLATFORM=$PLATFORM ARCH=$ARCH || echo "It should fail. Running remaining commands in the emulator"
98+
make test PLATFORM=$PLATFORM ARCH=$ARCH -j4 || echo "It should fail. Running remaining commands in the emulator"
10199
cat > commands.sh << EOF
102100
mv -f /data/local/tmp/sqlite3 /system/xbin
103101
cd /data/local/tmp
@@ -119,7 +117,7 @@ jobs:
119117
120118
- name: test sqlite-sync
121119
if: matrix.name == 'linux' || matrix.name == 'windows'
122-
run: make test
120+
run: make test -j4
123121

124122
- name: test sqlite-sync + coverage
125123
if: matrix.name == 'macos'

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ endif
265265
# --without-zsh-functions-dir \
266266
# --without-libgsasl \
267267
268-
cd $(CURL_SRC) && make
268+
cd $(CURL_SRC) && $(MAKE)
269269

270270
mkdir -p $(CURL_DIR)/$(PLATFORM)
271271
mv $(CURL_SRC)/lib/.libs/libcurl.a $(CURL_DIR)/$(PLATFORM)

0 commit comments

Comments
 (0)