Skip to content

Commit b280b52

Browse files
ci mac build patch 1
1 parent 8a2cfca commit b280b52

1 file changed

Lines changed: 26 additions & 17 deletions

File tree

.github/workflows/ci.yml

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -208,22 +208,22 @@ jobs:
208208
path: ./depends/built
209209
key: ${{ matrix.name }}-${{ env.cache-name }}-${{ hashFiles('depends/packages/*', '.github/workflows/ci.yml') }}
210210

211-
# - name: Build depends
212-
# run: make $MAKEJOBS -C depends HOST=${{ matrix.host }} ${{ matrix.dep-opts }}
213-
214211
- name: Build depends
215-
run: |
216-
set +e
217-
make $MAKEJOBS -C depends HOST=${{ matrix.host }} ${{ matrix.dep-opts }}
218-
STATUS=$?
212+
run: make $MAKEJOBS -C depends HOST=${{ matrix.host }} ${{ matrix.dep-opts }}
213+
214+
# - name: Build depends
215+
# run: |
216+
# set +e
217+
# make $MAKEJOBS -C depends HOST=${{ matrix.host }} ${{ matrix.dep-opts }}
218+
# STATUS=$?
219219

220-
echo "==== Attempting to dump util/domd files found so far ===="
221-
find depends/work -path "*/openssl*/util/domd" -exec sh -c '
222-
echo "---- {} ----"
223-
sed -n "1,200p" "{}"
224-
' \;
220+
# echo "==== Attempting to dump util/domd files found so far ===="
221+
# find depends/work -path "*/openssl*/util/domd" -exec sh -c '
222+
# echo "---- {} ----"
223+
# sed -n "1,200p" "{}"
224+
# ' \;
225225

226-
exit $STATUS
226+
# exit $STATUS
227227

228228
- name: CCache
229229
uses: actions/cache@v4
@@ -240,14 +240,23 @@ jobs:
240240
chmod +x autogen.sh
241241
chmod -R +x depends || true
242242
chmod +x share/genbuild.sh
243+
243244
SHORT_COMMIT=$(echo "$GIT_COMMIT_ID" | cut -c1-7)
244245
depends/${{ matrix.host }}/native/bin/ccache --max-size=$CCACHE_SIZE
246+
245247
./autogen.sh
246248
chmod +x configure || true
247-
./configure --prefix=`pwd`/depends/${{ matrix.host }} ${{ matrix.config-opts }} --enable-reduce-exports \
248-
CFLAGS="-std=c++17 -DGIT_COMMIT_ID=\\\"$SHORT_COMMIT\\\"" \
249-
CXXFLAGS="-std=c++17 -DGIT_COMMIT_ID=\\\"$SHORT_COMMIT\\\"" || ( cat config.log && false)
250-
make $MAKEJOBS ${{ matrix.goal }} CXXFLAGS="-std=c++17" || (echo "Build failure. Verbose build follows." && make ${{ matrix.goal }} CXXFLAGS="-std=c++17" V=1 ; false)
249+
250+
./configure --prefix=`pwd`/depends/${{ matrix.host }} \
251+
${{ matrix.config-opts }} \
252+
--enable-reduce-exports \
253+
CFLAGS="-pipe -O2 -DGIT_COMMIT_ID=\\\"$SHORT_COMMIT\\\"" \
254+
CXXFLAGS="-std=c++17 -pipe -O2 -DGIT_COMMIT_ID=\\\"$SHORT_COMMIT\\\"" \
255+
|| (cat config.log && false)
256+
257+
make $MAKEJOBS ${{ matrix.goal }} \
258+
CXXFLAGS="-std=c++17" \
259+
|| (echo "Build failure. Verbose build follows." && make ${{ matrix.goal }} CXXFLAGS="-std=c++17" V=1 ; false)
251260
252261
- name: Run benchmark
253262
if: ${{ matrix.run-bench }}

0 commit comments

Comments
 (0)