Skip to content

Commit 2f5822f

Browse files
committed
.github/workflows/c.yml: oh, yeah, MKDOC is dead, long live CXREF!
1 parent 37c08b5 commit 2f5822f

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

.github/workflows/c.yml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
regressionTest:
12-
name: "${{ matrix.os }} ${{ matrix.make }} CC=${{ matrix.cc }} ${{ matrix.sanitizer }}=yes MKDOC=${{ matrix.docs }}"
12+
name: "${{ matrix.os }} ${{ matrix.make }} CC=${{ matrix.cc }} ${{ matrix.sanitizer }}=yes CXREF=${{ matrix.docs }}"
1313
runs-on: ${{ matrix.os }}
1414
strategy:
1515
fail-fast: false
@@ -21,13 +21,15 @@ jobs:
2121
cc: [ gcc, clang ]
2222
make: [ bmake, make ]
2323
sanitizer: [ NO_SANI, USE_ASAN, USE_UBSAN, USE_LEAKSAN ]
24-
docs: [ yes, no ]
24+
docs: [ cxref, true ]
2525
# XXX this isn't the ideal way to handle a binary option?
2626
parallel: [ '-j 3', '' ]
2727
exclude:
2828
#
2929
# N.B.: here we _EXCLUDE_ the matrix options we don't want!
3030
#
31+
# xxx Travis has "include:", does it work here?
32+
#
3133
# MacOS-11.x
3234
- os: macos-11
3335
# it's clang anyway
@@ -36,7 +38,7 @@ jobs:
3638
# make is gmake
3739
make: make
3840
- os: macos-11
39-
docs: yes
41+
docs: cxref
4042
- os: macos-11
4143
parallel: ''
4244
#
@@ -48,7 +50,7 @@ jobs:
4850
# make is gmake
4951
make: make
5052
- os: macos-12
51-
docs: yes
53+
docs: cxref
5254
- os: macos-12
5355
parallel: ''
5456
#
@@ -60,7 +62,7 @@ jobs:
6062
# make is gmake
6163
make: make
6264
- os: macos-13
63-
docs: yes
65+
docs: cxref
6466
- os: macos-13
6567
parallel: ''
6668
#
@@ -72,7 +74,7 @@ jobs:
7274
# make is gmake
7375
make: make
7476
- os: macos-14
75-
docs: yes
77+
docs: cxref
7678
- os: macos-14
7779
parallel: ''
7880
#
@@ -84,7 +86,7 @@ jobs:
8486
# make is gmake
8587
make: make
8688
- os: macos-latest
87-
docs: yes
89+
docs: cxref
8890
- os: macos-latest
8991
parallel: ''
9092
#
@@ -93,7 +95,7 @@ jobs:
9395
# it's gmake
9496
make: make
9597
- os: ubuntu-22.04
96-
docs: no
98+
docs: true
9799
- os: ubuntu-22.04
98100
parallel: ''
99101
#
@@ -104,7 +106,7 @@ jobs:
104106
- os: ubuntu-20.04
105107
# cxref trips an error in a system header
106108
# /usr/include/x86_64-linux-gnu/bits/mathcalls-helper-functions.h:21: cxref: syntax error, unexpected IDENTIFIER, expecting ')'
107-
docs: yes
109+
docs: cxref
108110
- os: ubuntu-20.04
109111
# BMake 20181221 seems to run SUBDIR in parallel, but doesn't
110112
# support .WAIT in the list!
@@ -120,7 +122,7 @@ jobs:
120122
# it's gmake
121123
make: make
122124
- os: ubuntu-latest
123-
docs: no
125+
docs: true
124126
- os: ubuntu-latest
125127
parallel: ''
126128
#
@@ -131,7 +133,7 @@ jobs:
131133
- os: netbsd-latest
132134
cc: clang
133135
- os: netbsd-latest
134-
docs: no
136+
docs: true
135137
- os: netbsd-latest
136138
parallel: ''
137139
steps:
@@ -173,16 +175,16 @@ jobs:
173175
env | sort
174176
- name: build
175177
run: |
176-
MAKEOBJDIRPREFIX=$(pwd -P)/build ${{ matrix.make }} ${{ matrix.parallel }} CC=${{ matrix.cc }} ${{ matrix.sanitizer }}=yes MKDOC=${{ matrix.docs }}
178+
MAKEOBJDIRPREFIX=$(pwd -P)/build ${{ matrix.make }} ${{ matrix.parallel }} CC=${{ matrix.cc }} ${{ matrix.sanitizer }}=yes CXREF=${{ matrix.docs }}
177179
- name: distribution without parallel
178180
# XXX BMake does not seem to handle parallel installs well yet....
179181
if: ${{ startsWith(matrix.make, 'bmake') }}
180182
run: |
181-
MAKEOBJDIRPREFIX=$(pwd -P)/build ${{ matrix.make }} install MKDOC=${{ matrix.docs }} DESTDIR=$(pwd -P)/dist
183+
MAKEOBJDIRPREFIX=$(pwd -P)/build ${{ matrix.make }} install CXREF=${{ matrix.docs }} DESTDIR=$(pwd -P)/dist
182184
- name: distribution in parallel
183185
if: ${{ ! startsWith(matrix.make, 'bmake') }}
184186
run: |
185-
MAKEOBJDIRPREFIX=$(pwd -P)/build ${{ matrix.make }} ${{ matrix.parallel }} install MKDOC=${{ matrix.docs }} DESTDIR=$(pwd -P)/dist
187+
MAKEOBJDIRPREFIX=$(pwd -P)/build ${{ matrix.make }} ${{ matrix.parallel }} install CXREF=${{ matrix.docs }} DESTDIR=$(pwd -P)/dist
186188
- name: regression
187189
run: |
188-
MAKEOBJDIRPREFIX=$(pwd -P)/build ${{ matrix.make }} ${{ matrix.parallel }} regress MKDOC=${{ matrix.docs }}
190+
MAKEOBJDIRPREFIX=$(pwd -P)/build ${{ matrix.make }} ${{ matrix.parallel }} regress CXREF=${{ matrix.docs }}

0 commit comments

Comments
 (0)