Skip to content

Commit 555ca6c

Browse files
authored
Merge pull request #10129 from iNavFlight/mmosca-parallel-build
Change number of builds and make builds faster
2 parents e62fb97 + bbad573 commit 555ca6c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
id: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
12+
id: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
1313

1414
steps:
1515
- uses: actions/checkout@v3
@@ -36,7 +36,7 @@ jobs:
3636
path: downloads
3737
key: ${{ runner.os }}-downloads-${{ hashFiles('CMakeLists.txt') }}-${{ hashFiles('**/cmake/*')}}
3838
- name: Build targets (${{ matrix.id }})
39-
run: mkdir -p build && cd build && cmake -DWARNINGS_AS_ERRORS=ON -DCI_JOB_INDEX=${{ matrix.id }} -DCI_JOB_COUNT=${{ strategy.job-total }} -DBUILD_SUFFIX=${{ env.BUILD_SUFFIX }} -G Ninja .. && ninja ci
39+
run: mkdir -p build && cd build && cmake -DWARNINGS_AS_ERRORS=ON -DCI_JOB_INDEX=${{ matrix.id }} -DCI_JOB_COUNT=${{ strategy.job-total }} -DBUILD_SUFFIX=${{ env.BUILD_SUFFIX }} -DMAIN_COMPILE_OPTIONS=-pipe -G Ninja .. && ninja -j4 ci
4040
- name: Upload artifacts
4141
uses: actions/upload-artifact@v3
4242
with:
@@ -66,7 +66,7 @@ jobs:
6666
echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV
6767
echo "BUILD_NAME=inav-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV
6868
- name: Build SITL
69-
run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja .. && ninja
69+
run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja .. && ninja -j4
7070
- name: Upload artifacts
7171
uses: actions/upload-artifact@v3
7272
with:
@@ -101,7 +101,7 @@ jobs:
101101
run: |
102102
mkdir -p build_SITL && cd build_SITL
103103
cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -G Ninja ..
104-
ninja
104+
ninja -j3
105105
106106
- name: Upload artifacts
107107
uses: actions/upload-artifact@v3
@@ -137,7 +137,7 @@ jobs:
137137
echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV
138138
echo "BUILD_NAME=inav-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV
139139
- name: Build SITL
140-
run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja .. && ninja
140+
run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja .. && ninja -j4
141141
- name: Upload artifacts
142142
uses: actions/upload-artifact@v3
143143
with:
@@ -146,7 +146,7 @@ jobs:
146146

147147

148148
test:
149-
needs: [build]
149+
#needs: [build]
150150
runs-on: ubuntu-latest
151151
steps:
152152
- uses: actions/checkout@v3

0 commit comments

Comments
 (0)