Skip to content

Commit 229edd8

Browse files
committed
move flags farther to the back of the workflow
1 parent 1a54bb6 commit 229edd8

File tree

1 file changed

+12
-24
lines changed

1 file changed

+12
-24
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,12 @@ permissions:
1010

1111
jobs:
1212
R-CMD-check:
13-
runs-on: macos-15
13+
runs-on: macos-latest
1414
name: macOS (R-devel, clang 16)
1515

1616
env:
1717
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
1818
R_KEEP_PKG_SOURCE: yes
19-
CC: "clang -mmacos-version-min=15 -fsanitize=address,undefined"
20-
CXX: "clang++ -mmacos-version-min=15 -fsanitize=address,undefined"
21-
CFLAGS: "-falign-functions=8 -g -O2 -Wall -pedantic -Wconversion -Wno-sign-conversion -Wstrict-prototypes"
22-
CXXFLAGS: "-g -O2 -Wall -pedantic -Wconversion -Wno-sign-conversion"
2319
MAKE: make -j2
2420
LC_CTYPE: en_GB.UTF-8
2521
MallocNanoZone: 0
@@ -44,30 +40,17 @@ jobs:
4440
- name: Install system dependencies
4541
run: |
4642
brew update
47-
brew install gcc
48-
brew install llvm@16
49-
brew install automake
50-
brew install fribidi
51-
brew install gettext
52-
brew install pcre2
53-
brew install xz
54-
brew install libgit2
55-
brew install udunits
56-
brew install cairo
57-
brew install pkg-config
58-
brew install tcl-tk
59-
brew install jpeg
60-
brew install libpng
61-
brew install libtiff
43+
brew install gcc llvm@16 automake fribidi gettext pcre2 xz libgit2
44+
brew install udunits cairo pkg-config tcl-tk jpeg libpng libtiff
6245
xcode-select --install || true
6346
6447
- name: Configure clang 16
6548
run: |
49+
echo "/usr/local/opt/llvm@16/bin" >> $GITHUB_PATH
6650
echo "CC=/usr/local/opt/llvm@16/bin/clang" >> $GITHUB_ENV
6751
echo "CXX=/usr/local/opt/llvm@16/bin/clang++" >> $GITHUB_ENV
6852
echo "LDFLAGS=-L/usr/local/opt/llvm@16/lib -Wl,-rpath,/usr/local/opt/llvm@16/lib" >> $GITHUB_ENV
6953
echo "CPPFLAGS=-I/usr/local/opt/llvm@16/include" >> $GITHUB_ENV
70-
echo "/usr/local/opt/llvm@16/bin" >> $GITHUB_PATH
7154
7255
- name: Download and compile R-devel
7356
run: |
@@ -85,14 +68,19 @@ jobs:
8568
--with-readline \
8669
--with-tcltk \
8770
--with-recommended-packages \
88-
--enable-RGBA \
89-
CC="$CC" \
90-
CXX="$CXX"
71+
--enable-RGBA
9172
make
9273
sudo make install
9374
9475
- uses: r-lib/actions/setup-pandoc@v2
9576

77+
- name: Configure sanitizers for package check
78+
run: |
79+
echo "CC=clang -mmacos-version-min=15 -fsanitize=address,undefined" >> $GITHUB_ENV
80+
echo "CXX=clang++ -mmacos-version-min=15 -fsanitize=address,undefined" >> $GITHUB_ENV
81+
echo "CFLAGS=-falign-functions=8 -g -O2 -Wall -pedantic -Wconversion -Wno-sign-conversion -Wstrict-prototypes" >> $GITHUB_ENV
82+
echo "CXXFLAGS=-g -O2 -Wall -pedantic -Wconversion -Wno-sign-conversion" >> $GITHUB_ENV
83+
9684
- name: Install package dependencies
9785
run: |
9886
R -e 'install.packages("remotes")'

0 commit comments

Comments
 (0)