Skip to content

Commit 38bd9de

Browse files
committed
fix ci java build using correct autotools env var (closes OpenLightingProject#1883)
1 parent 7e79607 commit 38bd9de

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/workflows/build.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,25 +90,22 @@ jobs:
9090
- name: Autoreconf
9191
run: sudo --preserve-env -u builduser env "PATH=$PATH" autoreconf -i
9292
- name: Set configure arguments
93-
run: |
94-
echo "GH_OLA_CONFIGURE_ARGS=${{ matrix.configure-args }}" >> $GITHUB_ENV
95-
- name: Set distcheck configure arguments
96-
if: matrix.task == 'distcheck'
93+
# Env var name DISTCHECK_CONFIGURE_FLAGS must be used, see #1881 and #1883
9794
run: |
9895
echo "DISTCHECK_CONFIGURE_FLAGS=${{ matrix.configure-args }}" >> $GITHUB_ENV
9996
- name: Set additional Linux configure arguments
10097
if: runner.os == 'Linux'
10198
# Silence all deprecated declarations on Linux due to auto_ptr making the build log too long
10299
run: |
103-
echo "GH_OLA_CONFIGURE_ARGS=$GH_OLA_CONFIGURE_ARGS CPPFLAGS=-Wno-deprecated-declarations" >> $GITHUB_ENV
100+
echo "DISTCHECK_CONFIGURE_FLAGS=$DISTCHECK_CONFIGURE_FLAGS CPPFLAGS=-Wno-deprecated-declarations" >> $GITHUB_ENV
104101
- name: Set additional Linux distcheck configure arguments
105102
if: matrix.task == 'distcheck'
106103
run: |
107104
echo "DISTCHECK_CONFIGURE_FLAGS=${{ matrix.configure-args }} CPPFLAGS=-Wno-deprecated-declarations" >> $GITHUB_ENV
108105
- name: Print configure command
109-
run: echo "./configure $GH_OLA_CONFIGURE_ARGS"
106+
run: echo "./configure $DISTCHECK_CONFIGURE_FLAGS"
110107
- name: Configure
111-
run: sudo --preserve-env -u builduser env "PATH=$PATH" ./configure $GH_OLA_CONFIGURE_ARGS
108+
run: sudo --preserve-env -u builduser env "PATH=$PATH" ./configure $DISTCHECK_CONFIGURE_FLAGS
112109
- name: ${{ matrix.task }}
113110
run: sudo --preserve-env -u builduser env "PATH=$PATH" make ${{ matrix.task }} -j${{ steps.num-cpu-cores.outputs.NUM_CPU_CORES }} VERBOSE=1
114111
- name: Display structure of the built files

.travis-ci.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ elif [[ $TASK = 'flake8' ]]; then
232232
make flake8
233233
else
234234
# Otherwise compile and check as normal
235+
# Env var name DISTCHECK_CONFIGURE_FLAGS must be used, see #1881 and #1883
235236
if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then
236237
# Silence all deprecated declarations on Linux due to auto_ptr making the build log too long
237238
export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-ja-rule --enable-e133 CPPFLAGS=-Wno-deprecated-declarations'

0 commit comments

Comments
 (0)