From ae94aece1220dfa2393be65d0f44fd3234307625 Mon Sep 17 00:00:00 2001 From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com> Date: Wed, 18 Dec 2024 09:08:44 -0600 Subject: [PATCH] Add libjpeg-dev for autotools and remove libncurses5 in CMake (#791) --- .github/workflows/aocc-auto.yml | 6 ++++-- .github/workflows/cmake-analysis.yml | 8 ++++---- .github/workflows/cmake-script.yml | 2 +- .github/workflows/intel-auto.yml | 2 +- .github/workflows/main-auto.yml | 2 +- .github/workflows/netcdf-cmake.yml | 3 ++- .github/workflows/netcdf.yml | 3 ++- .github/workflows/nvhpc-auto.yml | 2 +- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/aocc-auto.yml b/.github/workflows/aocc-auto.yml index 5c37b68dd..79f2ac15d 100644 --- a/.github/workflows/aocc-auto.yml +++ b/.github/workflows/aocc-auto.yml @@ -31,7 +31,7 @@ jobs: sudo apt install -y libaec-dev zlib1g-dev automake autoconf libcurl4-openssl-dev sudo apt install -y libjpeg-dev wget curl bzip2 m4 flex bison cmake libzip-dev sudo apt install -y doxygen openssl libtool libtool-bin build-essential - sudo apt install -y libncurses-dev libquadmath0 libstdc++6 libxml2 + sudo apt install -y libquadmath0 libstdc++6 libxml2 - name: Install AOCC 4.2.0 shell: bash @@ -95,7 +95,9 @@ jobs: shell: bash run: | sudo apt update - sudo apt install -y libaec-dev zlib1g-dev automake autoconf libcurl4-openssl-dev libjpeg-dev wget curl bzip2 m4 flex bison cmake libzip-dev doxygen openssl libtool libtool-bin build-essential libncurses-dev libquadmath0 libstdc++6 libxml2 + sudo apt install -y libaec-dev zlib1g-dev automake autoconf libcurl4-openssl-dev + sudo apt install -y libjpeg-dev wget curl bzip2 m4 flex bison libzip-dev doxygen openssl + sudo apt install -y libtool libtool-bin build-essential libquadmath0 libstdc++6 libxml2 - name: Install AOCC 4.2.0 shell: bash diff --git a/.github/workflows/cmake-analysis.yml b/.github/workflows/cmake-analysis.yml index 80276aeac..74b066aa4 100644 --- a/.github/workflows/cmake-analysis.yml +++ b/.github/workflows/cmake-analysis.yml @@ -32,7 +32,7 @@ jobs: - name: Install CMake Dependencies (Linux_coverage) run: | sudo apt update - sudo apt-get install ninja-build doxygen graphviz curl libncurses5 build-essential + sudo apt-get install ninja-build doxygen graphviz curl build-essential sudo apt-get install lcov -q -y - name: Set file base name (Linux_coverage) @@ -124,7 +124,7 @@ jobs: - name: Install CMake Dependencies (Linux_Leak) run: | sudo apt update - sudo apt-get install ninja-build doxygen graphviz curl libncurses5 + sudo apt-get install ninja-build doxygen graphviz curl - name: add clang to env uses: KyleMayes/install-llvm-action@v2.0.5 @@ -222,7 +222,7 @@ jobs: - name: Install CMake Dependencies (Linux_Address) run: | sudo apt update - sudo apt-get install ninja-build doxygen graphviz curl libncurses5 + sudo apt-get install ninja-build doxygen graphviz curl - name: add clang to env uses: KyleMayes/install-llvm-action@v2.0.5 @@ -320,7 +320,7 @@ jobs: - name: Install CMake Dependencies (Linux_UndefinedBehavior) run: | sudo apt update - sudo apt-get install ninja-build doxygen graphviz curl libncurses5 + sudo apt-get install ninja-build doxygen graphviz curl - name: add clang to env uses: KyleMayes/install-llvm-action@v2.0.5 diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml index c2c3f6724..1d3c1ddb4 100644 --- a/.github/workflows/cmake-script.yml +++ b/.github/workflows/cmake-script.yml @@ -615,7 +615,7 @@ jobs: - name: Install CMake Dependencies (Linux_clang) run: | sudo apt-get update - sudo apt-get install ninja-build doxygen graphviz curl libncurses5 + sudo apt-get install ninja-build doxygen graphviz curl - name: add clang to env uses: KyleMayes/install-llvm-action@v2.0.5 diff --git a/.github/workflows/intel-auto.yml b/.github/workflows/intel-auto.yml index 0ef4bd5a0..682413126 100644 --- a/.github/workflows/intel-auto.yml +++ b/.github/workflows/intel-auto.yml @@ -28,7 +28,7 @@ jobs: shell: bash run: | sudo apt-get update - sudo apt-get install autoconf automake libtool libtool-bin libaec-dev + sudo apt-get install autoconf automake libtool libtool-bin libaec-dev libjpeg-dev - name: Install oneAPI (Linux) uses: fortran-lang/setup-fortran@v1 diff --git a/.github/workflows/main-auto.yml b/.github/workflows/main-auto.yml index e08ed5092..23cb09873 100644 --- a/.github/workflows/main-auto.yml +++ b/.github/workflows/main-auto.yml @@ -41,7 +41,7 @@ jobs: sudo apt-get update sudo apt install gcc-12 g++-12 gfortran-12 sudo apt install automake autoconf libtool libtool-bin - sudo apt install libaec0 libaec-dev + sudo apt install libjpeg-dev libaec0 libaec-dev echo "CC=gcc-12" >> $GITHUB_ENV echo "CXX=g++-12" >> $GITHUB_ENV diff --git a/.github/workflows/netcdf-cmake.yml b/.github/workflows/netcdf-cmake.yml index db7154dea..5f0d00014 100644 --- a/.github/workflows/netcdf-cmake.yml +++ b/.github/workflows/netcdf-cmake.yml @@ -30,7 +30,8 @@ jobs: sudo apt-get update sudo apt-get install ninja-build sudo apt install libssl3 libssl-dev libcurl4 - sudo apt install -y libaec-dev zlib1g-dev automake autoconf libcurl4-openssl-dev libjpeg-dev wget curl bzip2 m4 flex bison cmake libzip-dev doxygen openssl libtool libtool-bin + sudo apt install -y libaec-dev zlib1g-dev automake autoconf libcurl4-openssl-dev libjpeg-dev wget curl + sudo apt install -y bzip2 m4 flex bison cmake libzip-dev doxygen openssl libtool libtool-bin - name: Checkout HDF4 uses: actions/checkout@v4.1.7 diff --git a/.github/workflows/netcdf.yml b/.github/workflows/netcdf.yml index b9013bb16..0d0add5cd 100644 --- a/.github/workflows/netcdf.yml +++ b/.github/workflows/netcdf.yml @@ -28,7 +28,8 @@ jobs: - name: Install System dependencies run: | sudo apt update - sudo apt install -y libaec-dev zlib1g-dev automake autoconf libcurl4-openssl-dev libjpeg-dev wget curl bzip2 m4 flex bison cmake libzip-dev doxygen openssl libtool libtool-bin + sudo apt install -y libaec-dev zlib1g-dev automake autoconf libcurl4-openssl-dev libjpeg-dev wget curl + sudo apt install -y bzip2 m4 flex bison libzip-dev doxygen openssl libtool libtool-bin - name: Checkout HDF4 uses: actions/checkout@v4.1.7 diff --git a/.github/workflows/nvhpc-auto.yml b/.github/workflows/nvhpc-auto.yml index 09238364f..7fef3e318 100644 --- a/.github/workflows/nvhpc-auto.yml +++ b/.github/workflows/nvhpc-auto.yml @@ -28,7 +28,7 @@ jobs: shell: bash run: | sudo apt-get update - sudo apt-get install autoconf automake libtool libtool-bin libaec-dev + sudo apt-get install autoconf automake libtool libtool-bin libaec-dev libjpeg-dev - name: Install NVHPC shell: bash