Skip to content

Commit 94f2fe5

Browse files
committed
GitHub Actions CI: Specify CXX before make distcheck
As in the build step. Otherwise, the distcheck's configure run will just pick up the default compiler again.
1 parent b486a13 commit 94f2fe5

8 files changed

+32
-8
lines changed

.github/workflows/autotools-clang-5.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@ jobs:
2020
- name: Test
2121
run: make check
2222
- name: Distcheck
23-
run: make distcheck
23+
run: |
24+
# distcheck runs configure again so we need to specify CXX again.
25+
export CXX=clang++-5.0
26+
make distcheck

.github/workflows/autotools-clang-6.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@ jobs:
2020
- name: Test
2121
run: make check
2222
- name: Distcheck
23-
run: make distcheck
23+
run: |
24+
# distcheck runs configure again so we need to specify CXX again.
25+
export CXX=clang++-6.0
26+
make distcheck

.github/workflows/autotools-clang-7.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@ jobs:
2020
- name: Test
2121
run: make check
2222
- name: Distcheck
23-
run: make distcheck
23+
run: |
24+
# distcheck runs configure again so we need to specify CXX again.
25+
export CXX=clang++-7
26+
make distcheck

.github/workflows/autotools-clang-8.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@ jobs:
2020
- name: Test
2121
run: make check
2222
- name: Distcheck
23-
run: make distcheck
23+
run: |
24+
# distcheck runs configure again so we need to specify CXX again.
25+
export CXX=clang++-8
26+
make distcheck

.github/workflows/autotools-clang-9.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,7 @@ jobs:
2121
- name: Test
2222
run: make check
2323
- name: Distcheck
24-
run: make distcheck
24+
run: |
25+
# distcheck runs configure again so we need to specify CXX again.
26+
export CXX=clang++-9
27+
make distcheck

.github/workflows/autotools-gcc-7.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@ jobs:
2020
- name: Test
2121
run: make check
2222
- name: Distcheck
23-
run: make distcheck
23+
run: |
24+
# distcheck runs configure again so we need to specify CXX again.
25+
export CXX=g++-7
26+
make distcheck

.github/workflows/autotools-gcc-8.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@ jobs:
2020
- name: Test
2121
run: make check
2222
- name: Distcheck
23-
run: make distcheck
23+
run: |
24+
# distcheck runs configure again so we need to specify CXX again.
25+
export CXX=g++-8
26+
make distcheck

.github/workflows/autotools-gcc-9.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,7 @@ jobs:
2121
- name: Test
2222
run: make check
2323
- name: Distcheck
24-
run: make distcheck
24+
run: |
25+
# distcheck runs configure again so we need to specify CXX again.
26+
export CXX=g++-9
27+
make distcheck

0 commit comments

Comments
 (0)