From 1de4f303b5e77cec610239ca9e0eb795e90fa60d Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Tue, 27 Feb 2024 02:11:35 -0800 Subject: [PATCH] Fix build mode in Autotools GH actions --- .github/workflows/aocc-auto.yml | 8 ++++++-- .github/workflows/autotools.yml | 8 ++++++++ .github/workflows/intel-auto.yml | 6 +++++- .github/workflows/main-auto.yml | 6 +++++- .github/workflows/nvhpc-auto.yml | 7 +++++-- .github/workflows/ppc64.yml | 2 +- 6 files changed, 30 insertions(+), 7 deletions(-) diff --git a/.github/workflows/aocc-auto.yml b/.github/workflows/aocc-auto.yml index c9357090f6..0d7499ba59 100644 --- a/.github/workflows/aocc-auto.yml +++ b/.github/workflows/aocc-auto.yml @@ -7,6 +7,10 @@ on: description: "release vs. debug build" required: true type: string + build_option: + description: "--enable-production or --disable-production" + required: true + type: string permissions: contents: read @@ -48,7 +52,7 @@ jobs: mkdir "${{ runner.workspace }}/build" cd "${{ runner.workspace }}/build" $GITHUB_WORKSPACE/configure \ - --enable-build-mode=${{ inputs.build_mode }} \ + ${{ inputs.build_option }} \ --enable-netcdf \ --enable-shared \ --disable-fortran \ @@ -116,7 +120,7 @@ jobs: mkdir "${{ runner.workspace }}/build" cd "${{ runner.workspace }}/build" $GITHUB_WORKSPACE/configure \ - --enable-build-mode=${{ inputs.build_mode }} \ + ${{ inputs.build_option }} \ --enable-netcdf \ --disable-shared \ --enable-fortran \ diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml index 0a5a6ea10f..5f055e9709 100644 --- a/.github/workflows/autotools.yml +++ b/.github/workflows/autotools.yml @@ -18,6 +18,7 @@ jobs: netcdf: enable shared: enable build_mode: "debug" + build_option: "--disable-production" call-release-netcdf-autotools: name: "Autotools Release NetCDF Workflows" @@ -26,6 +27,7 @@ jobs: netcdf: enable shared: enable build_mode: "production" + build_option: "--enable-production" call-debug-static-autotools: name: "Autotools Debug Static Workflows" @@ -34,6 +36,7 @@ jobs: netcdf: disable shared: disable build_mode: "debug" + build_option: "--disable-production" call-release-static-autotools: name: "Autotools Release Static Workflows" @@ -42,21 +45,26 @@ jobs: netcdf: disable shared: disable build_mode: "production" + build_option: "--enable-production" call-release-auto-intel: name: "Autotools Intel Workflows" uses: ./.github/workflows/intel-auto.yml with: build_mode: "production" + build_option: "--enable-production" call-release-auto-nvhpc: name: "Autotools nvhpc Workflows" uses: ./.github/workflows/nvhpc-auto.yml with: build_mode: "production" + build_option: "--enable-production" call-release-auto-aocc: name: "Autotools aocc Workflows" uses: ./.github/workflows/aocc-auto.yml with: build_mode: "production" + build_option: "--enable-production" + diff --git a/.github/workflows/intel-auto.yml b/.github/workflows/intel-auto.yml index 5e43f2961f..b6388c35d3 100644 --- a/.github/workflows/intel-auto.yml +++ b/.github/workflows/intel-auto.yml @@ -7,6 +7,10 @@ on: description: "release vs. debug build" required: true type: string + build_option: + description: "--enable-production or --disable-production" + required: true + type: string permissions: contents: read @@ -57,7 +61,7 @@ jobs: mkdir "${{ runner.workspace }}/build" cd "${{ runner.workspace }}/build" $GITHUB_WORKSPACE/configure \ - --enable-build-mode=${{ inputs.build_mode }} \ + ${{ inputs.build_option }} \ --enable-netcdf \ --enable-shared \ --disable-fortran diff --git a/.github/workflows/main-auto.yml b/.github/workflows/main-auto.yml index 1ca6ec81dc..858a422198 100644 --- a/.github/workflows/main-auto.yml +++ b/.github/workflows/main-auto.yml @@ -8,6 +8,10 @@ on: description: "release vs. debug build" required: true type: string + build_option: + description: "--enable-production or --disable-production" + required: true + type: string shared: description: "shared enable/disable" required: true @@ -59,7 +63,7 @@ jobs: mkdir "${{ runner.workspace }}/build" cd "${{ runner.workspace }}/build" $GITHUB_WORKSPACE/configure \ - --enable-build-mode=${{ inputs.build_mode }} \ + ${{ inputs.build_option }} \ --${{ inputs.netcdf }}-netcdf \ --disable-fortran \ --${{ inputs.shared }}-java \ diff --git a/.github/workflows/nvhpc-auto.yml b/.github/workflows/nvhpc-auto.yml index 803eab9042..a96e1d6461 100644 --- a/.github/workflows/nvhpc-auto.yml +++ b/.github/workflows/nvhpc-auto.yml @@ -7,6 +7,10 @@ on: description: "release vs. debug build" required: true type: string + build_option: + description: "--enable-production or --disable-production" + required: true + type: string permissions: contents: read @@ -46,8 +50,7 @@ jobs: mkdir "${{ runner.workspace }}/build" cd "${{ runner.workspace }}/build" $GITHUB_WORKSPACE/configure \ - FCFLAGS="-fPIC -fortranlibs" \ - --enable-build-mode=${{ inputs.build_mode }} \ + ${{ inputs.build_option }} \ --disable-fortran \ --enable-shared \ #cat config.log diff --git a/.github/workflows/ppc64.yml b/.github/workflows/ppc64.yml index 669bdba26b..11dc9a6a0e 100644 --- a/.github/workflows/ppc64.yml +++ b/.github/workflows/ppc64.yml @@ -43,7 +43,7 @@ jobs: mkdir "build" cd "build" ../configure \ - --enable-build-mode=production \ + --enable-production \ --enable-netcdf \ --disable-fortran \ --disable-java \