Skip to content

Commit acfecb9

Browse files
committed
Shorten and reduce to two
1 parent d38bf03 commit acfecb9

File tree

1 file changed

+17
-18
lines changed

1 file changed

+17
-18
lines changed

.github/workflows/ci.yaml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ jobs:
1616
include:
1717
- { name: container, os: ubuntu-latest, container: rocker/r2u4ci }
1818
- { name: macos, os: macos-latest, openmp: yes }
19-
- { name: macos, os: macos-latest, openmp: no }
20-
- { name: macos, os: macos-latest, openmp: alt }
19+
#- { name: macos, os: macos-latest, openmp: no }
2120
#- { name: ubuntu, os: ubuntu-latest }
2221

2322

@@ -31,24 +30,24 @@ jobs:
3130
- name: Setup
3231
uses: eddelbuettel/github-actions/r-ci@master
3332

33+
# - name: OpenMP for macOS
34+
# if: ${{ matrix.os == 'macos-latest' && matrix.openmp == 'yes' }}
35+
# run: |
36+
# curl -fsSL https://raw.githubusercontent.com/coatless-shell/openmp/main/install-openmp.sh | bash -s -- --yes
37+
# mkdir -p ~/.R
38+
# cat <<EOF > ~/.R/Makevars
39+
# CPPFLAGS += -Xclang -fopenmp
40+
# LDFLAGS += -lomp
41+
# EOF
42+
# cat ~/.R/Makevars
43+
# echo -n "R CMD config CXX: "; R CMD config CXX
44+
# echo -n "R CMD config CPPFLAGS: "; R CMD config CPPFLAGS
45+
# echo -n "R CMD config LDFLAGS: "; R CMD config LDFLAGS
46+
# echo -n "R CMD config SHLIB_CXXLD: "; R CMD config SHLIB_CXXLD
47+
# echo -n "R CMD config SHLIB_CXXLDFLAGS: "; R CMD config SHLIB_CXXLDFLAGS
48+
3449
- name: OpenMP for macOS
3550
if: ${{ matrix.os == 'macos-latest' && matrix.openmp == 'yes' }}
36-
run: |
37-
curl -fsSL https://raw.githubusercontent.com/coatless-shell/openmp/main/install-openmp.sh | bash -s -- --yes
38-
mkdir -p ~/.R
39-
cat <<EOF > ~/.R/Makevars
40-
CPPFLAGS += -Xclang -fopenmp
41-
LDFLAGS += -lomp
42-
EOF
43-
cat ~/.R/Makevars
44-
echo -n "R CMD config CXX: "; R CMD config CXX
45-
echo -n "R CMD config CPPFLAGS: "; R CMD config CPPFLAGS
46-
echo -n "R CMD config LDFLAGS: "; R CMD config LDFLAGS
47-
echo -n "R CMD config SHLIB_CXXLD: "; R CMD config SHLIB_CXXLD
48-
echo -n "R CMD config SHLIB_CXXLDFLAGS: "; R CMD config SHLIB_CXXLDFLAGS
49-
50-
- name: Alternate OpenMP for macOS
51-
if: ${{ matrix.os == 'macos-latest' && matrix.openmp == 'alt' }}
5251
run: |
5352
curl -O https://mac.r-project.org/openmp/openmp-17.0.6-darwin20-Release.tar.gz
5453
sudo tar fvxz openmp-17.0.6-darwin20-Release.tar.gz -C /

0 commit comments

Comments
 (0)