diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 554baa985..fb0bfe819 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -21,7 +21,7 @@ jobs: pkg: "gcc g++" - id: "distcheck-debian-stable-amd64-gcc" task: "distcheck" - configure-args: "--enable-ja-rule --enable-e133 --enable-rdm-tests --enable-java-libs" + configure-args: "--enable-ja-rule --enable-e133 --enable-rdm-tests" # TODO(Perry): Fix Debian 12 OOM issue on GitHub Actions container: "debian:stable" compiler: @@ -30,7 +30,7 @@ jobs: pkg: "gcc g++" - id: "distcheck-debian-stable-amd64-clang" task: "distcheck" - configure-args: "--enable-ja-rule --enable-e133 --enable-rdm-tests --enable-java-libs" + configure-args: "--enable-ja-rule --enable-e133 --enable-rdm-tests" # TODO(Perry): Fix Debian 12 OOM issue on GitHub Actions container: "debian:stable" compiler: @@ -90,17 +90,18 @@ jobs: - name: Autoreconf run: sudo --preserve-env -u builduser env "PATH=$PATH" autoreconf -i - name: Set configure arguments + # Env var name DISTCHECK_CONFIGURE_FLAGS must be used, see #1881 and #1883 run: | - echo "GH_OLA_CONFIGURE_ARGS=${{ matrix.configure-args }}" >> $GITHUB_ENV + echo "DISTCHECK_CONFIGURE_FLAGS=${{ matrix.configure-args }}" >> $GITHUB_ENV - name: Set additional Linux configure arguments if: runner.os == 'Linux' # Silence all deprecated declarations on Linux due to auto_ptr making the build log too long run: | - echo "GH_OLA_CONFIGURE_ARGS=$GH_OLA_CONFIGURE_ARGS CPPFLAGS=-Wno-deprecated-declarations" >> $GITHUB_ENV + echo "DISTCHECK_CONFIGURE_FLAGS=$DISTCHECK_CONFIGURE_FLAGS CPPFLAGS=-Wno-deprecated-declarations" >> $GITHUB_ENV - name: Print configure command - run: echo "./configure $GH_OLA_CONFIGURE_ARGS" + run: echo "./configure $DISTCHECK_CONFIGURE_FLAGS" - name: Configure - run: sudo --preserve-env -u builduser env "PATH=$PATH" ./configure $GH_OLA_CONFIGURE_ARGS + run: sudo --preserve-env -u builduser env "PATH=$PATH" ./configure $DISTCHECK_CONFIGURE_FLAGS - name: ${{ matrix.task }} run: sudo --preserve-env -u builduser env "PATH=$PATH" make ${{ matrix.task }} -j${{ steps.num-cpu-cores.outputs.NUM_CPU_CORES }} VERBOSE=1 - name: Display structure of the built files diff --git a/.travis-ci.sh b/.travis-ci.sh index fc9bd59e7..f76f7b72e 100755 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -232,6 +232,7 @@ elif [[ $TASK = 'flake8' ]]; then make flake8 else # Otherwise compile and check as normal + # Env var name DISTCHECK_CONFIGURE_FLAGS must be used, see #1881 and #1883 if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then # Silence all deprecated declarations on Linux due to auto_ptr making the build log too long export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-ja-rule --enable-e133 CPPFLAGS=-Wno-deprecated-declarations'