Skip to content

Commit c17d4da

Browse files
committed
Remove macOS and BSD builds from workflow
1 parent a079775 commit c17d4da

File tree

1 file changed

+2
-36
lines changed

1 file changed

+2
-36
lines changed
Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2023 Sebastian Pipping <sebastian@pipping.org>
22
# Licensed under Apache License Version 2.0
33

4-
name: Build on Linux/macOS
4+
name: Build on Linux
55

66
on:
77
pull_request:
@@ -37,21 +37,6 @@ jobs:
3737
clang_repo_suffix: null
3838
make: bmake
3939
runs-on: ubuntu-22.04
40-
- cc: gcc-12
41-
clang_major_version: null
42-
clang_repo_suffix: null
43-
make: make
44-
runs-on: macos-12
45-
- cc: gcc-13
46-
clang_major_version: null
47-
clang_repo_suffix: null
48-
make: bmake
49-
runs-on: macos-12
50-
- cc: clang-15
51-
clang_major_version: 15
52-
clang_repo_suffix: null
53-
make: bsdmake
54-
runs-on: macos-12
5540
steps:
5641
- name: Add Clang/LLVM repositories
5742
if: "${{ runner.os == 'Linux' && contains(matrix.cc, 'clang') }}"
@@ -71,13 +56,6 @@ jobs:
7156
musl-tools \
7257
pkg-config
7358
74-
- name: Install build dependencies
75-
if: "${{ runner.os == 'macOS' }}"
76-
run: |-
77-
brew install \
78-
bmake \
79-
bsdmake \
80-
coreutils
8159
8260
- name: Install build dependency Clang ${{ matrix.clang_major_version }}
8361
if: "${{ runner.os == 'Linux' && contains(matrix.cc, 'clang') }}"
@@ -86,12 +64,6 @@ jobs:
8664
clang-${{ matrix.clang_major_version }} \
8765
libclang-rt-${{ matrix.clang_major_version }}-dev
8866
89-
- name: Add versioned aliases for Clang ${{ matrix.clang_major_version }}
90-
if: "${{ runner.os == 'macOS' && contains(matrix.cc, 'clang') }}"
91-
run: |-
92-
set -x
93-
sudo ln -s "$(brew --prefix llvm@${{ matrix.clang_major_version }})"/bin/clang /usr/local/bin/clang-${{ matrix.clang_major_version }}
94-
sudo ln -s "$(brew --prefix llvm@${{ matrix.clang_major_version }})"/bin/clang++ /usr/local/bin/clang++-${{ matrix.clang_major_version }}
9567
9668
- name: Checkout Git branch
9769
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -143,13 +115,7 @@ jobs:
143115
run: |-
144116
set -x
145117
146-
# macOS default linker does not seem to support --as-needed,
147-
# would error out saying "ld: unknown option: --as-needed"
148-
if [[ ${{ runner.os }} = macOS ]]; then
149-
as_needed=
150-
else
151-
as_needed='-Wl,--as-needed'
152-
fi
118+
as_needed='-Wl,--as-needed'
153119
154120
# musl-gcc does not seem to support linking with sanitizers
155121
if [[ ${{ matrix.cc }} =~ musl ]]; then

0 commit comments

Comments
 (0)