From 7e79607c19aea8acba4d4984d780ab327e7f30d9 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Tue, 18 Jul 2023 04:15:16 +0100 Subject: [PATCH 1/4] Fix distcheck configure args --- .github/workflows/build.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 554baa985..d41e260de 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -92,11 +92,19 @@ jobs: - name: Set configure arguments run: | echo "GH_OLA_CONFIGURE_ARGS=${{ matrix.configure-args }}" >> $GITHUB_ENV + - name: Set distcheck configure arguments + if: matrix.task == 'distcheck' + run: | + 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 + - name: Set additional Linux distcheck configure arguments + if: matrix.task == 'distcheck' + run: | + echo "DISTCHECK_CONFIGURE_FLAGS=${{ matrix.configure-args }} CPPFLAGS=-Wno-deprecated-declarations" >> $GITHUB_ENV - name: Print configure command run: echo "./configure $GH_OLA_CONFIGURE_ARGS" - name: Configure From 38bd9de6638abb504326c6e4f2062b46beffa5db Mon Sep 17 00:00:00 2001 From: Perry Naseck Date: Wed, 26 Jul 2023 16:31:03 -0400 Subject: [PATCH 2/4] fix ci java build using correct autotools env var (closes #1883) --- .github/workflows/build.yaml | 11 ++++------- .travis-ci.sh | 1 + 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d41e260de..9b68ec257 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -90,25 +90,22 @@ jobs: - name: Autoreconf run: sudo --preserve-env -u builduser env "PATH=$PATH" autoreconf -i - name: Set configure arguments - run: | - echo "GH_OLA_CONFIGURE_ARGS=${{ matrix.configure-args }}" >> $GITHUB_ENV - - name: Set distcheck configure arguments - if: matrix.task == 'distcheck' + # Env var name DISTCHECK_CONFIGURE_FLAGS must be used, see #1881 and #1883 run: | 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: Set additional Linux distcheck configure arguments if: matrix.task == 'distcheck' run: | echo "DISTCHECK_CONFIGURE_FLAGS=${{ matrix.configure-args }} 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' From 514b05ab4101ab28137a6c92a5de37b10e607986 Mon Sep 17 00:00:00 2001 From: Perry Naseck <4472083+DaAwesomeP@users.noreply.github.com> Date: Thu, 27 Jul 2023 10:14:41 -0400 Subject: [PATCH 3/4] github actions build remove redundant condfigure flags Co-authored-by: Peter Newman --- .github/workflows/build.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9b68ec257..1f1ffa913 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -98,10 +98,6 @@ jobs: # Silence all deprecated declarations on Linux due to auto_ptr making the build log too long run: | echo "DISTCHECK_CONFIGURE_FLAGS=$DISTCHECK_CONFIGURE_FLAGS CPPFLAGS=-Wno-deprecated-declarations" >> $GITHUB_ENV - - name: Set additional Linux distcheck configure arguments - if: matrix.task == 'distcheck' - run: | - echo "DISTCHECK_CONFIGURE_FLAGS=${{ matrix.configure-args }} CPPFLAGS=-Wno-deprecated-declarations" >> $GITHUB_ENV - name: Print configure command run: echo "./configure $DISTCHECK_CONFIGURE_FLAGS" - name: Configure From 50de3e82075cfcaaaa062b9865086913b1c85067 Mon Sep 17 00:00:00 2001 From: Perry Naseck Date: Thu, 27 Jul 2023 10:16:41 -0400 Subject: [PATCH 4/4] github actions build disable java for now --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1f1ffa913..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: