Skip to content

Commit 0b80bfa

Browse files
powerboat9dkm
authored andcommitted
CI: Reenable macos runner
ChangeLog: * .github/workflows/ccpp.yml: Reenable macos runner, add some empty lines to improve formatting. Signed-off-by: Owen Avery <[email protected]>
1 parent 4d4be97 commit 0b80bfa

File tree

1 file changed

+60
-58
lines changed

1 file changed

+60
-58
lines changed

.github/workflows/ccpp.yml

Lines changed: 60 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -368,64 +368,66 @@ jobs:
368368
exit 0; \
369369
fi
370370
371-
# build-and-check-clang-macos:
372-
373-
# env:
374-
# # Force CC/CXX to be explicitly clang to make it clear which compiler is used
375-
# CC: clang
376-
# CXX: clang++
377-
378-
# runs-on: macos-13
379-
380-
# steps:
381-
# - uses: actions/checkout@v4
382-
383-
# - name: Install Deps
384-
# run: |
385-
# brew install dejagnu mpfr libmpc gmp;
386-
# # install Rust directly using rustup
387-
# curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.72.0;
388-
389-
# - name: Make Source Read-Only
390-
# run: chmod -R a-w ./*
391-
392-
# - name: Configure
393-
# run: |
394-
# mkdir -p gccrs-build;
395-
# cd gccrs-build;
396-
# ../configure \
397-
# --enable-languages=rust \
398-
# --disable-bootstrap \
399-
# --enable-multilib \
400-
# --with-native-system-header-dir=/usr/include \
401-
# --with-sysroot=$(xcrun --show-sdk-path)
402-
403-
# - name: Build
404-
# shell: bash
405-
# run: |
406-
# cd gccrs-build; \
407-
# make -j $(sysctl -n hw.ncpu) 2>&1 | tee log
408-
409-
# - name: Run Tests
410-
# run: |
411-
# cd gccrs-build; \
412-
# make check-rust
413-
# - name: Archive check-rust results
414-
# uses: actions/upload-artifact@v4
415-
# with:
416-
# name: check-rust-logs-macos
417-
# path: |
418-
# gccrs-build/gcc/testsuite/rust/
419-
# - name: Check regressions
420-
# run: |
421-
# cd gccrs-build; \
422-
# if grep -e "unexpected" -e "unresolved" -e "ERROR:" gcc/testsuite/rust/rust.sum;\
423-
# then \
424-
# echo "::error title=Regression test failed::some tests are not correct"; \
425-
# exit 1; \
426-
# else \
427-
# exit 0; \
428-
# fi
371+
build-and-check-clang-macos:
372+
373+
env:
374+
# Force CC/CXX to be explicitly clang to make it clear which compiler is used
375+
CC: clang
376+
CXX: clang++
377+
378+
runs-on: macos-13
379+
380+
steps:
381+
- uses: actions/checkout@v4
382+
383+
- name: Install Deps
384+
run: |
385+
brew install dejagnu mpfr libmpc gmp;
386+
# install Rust directly using rustup
387+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.72.0;
388+
389+
- name: Make Source Read-Only
390+
run: chmod -R a-w ./*
391+
392+
- name: Configure
393+
run: |
394+
mkdir -p gccrs-build;
395+
cd gccrs-build;
396+
../configure \
397+
--enable-languages=rust \
398+
--disable-bootstrap \
399+
--enable-multilib \
400+
--with-native-system-header-dir=/usr/include \
401+
--with-sysroot=$(xcrun --show-sdk-path)
402+
403+
- name: Build
404+
shell: bash
405+
run: |
406+
cd gccrs-build; \
407+
make -j $(sysctl -n hw.ncpu) 2>&1 | tee log
408+
409+
- name: Run Tests
410+
run: |
411+
cd gccrs-build; \
412+
make check-rust
413+
414+
- name: Archive check-rust results
415+
uses: actions/upload-artifact@v4
416+
with:
417+
name: check-rust-logs-macos
418+
path: |
419+
gccrs-build/gcc/testsuite/rust/
420+
421+
- name: Check regressions
422+
run: |
423+
cd gccrs-build; \
424+
if grep -e "unexpected" -e "unresolved" -e "ERROR:" gcc/testsuite/rust/rust.sum;\
425+
then \
426+
echo "::error title=Regression test failed::some tests are not correct"; \
427+
exit 1; \
428+
else \
429+
exit 0; \
430+
fi
429431
430432
build-and-check-asan:
431433

0 commit comments

Comments
 (0)