From 24a87f4883af54208d3a7fd82ba6a12efc68966b Mon Sep 17 00:00:00 2001 From: Alexis Montoison Date: Tue, 11 Jun 2024 23:43:30 -0400 Subject: [PATCH] Don't provide examples and tests binaries when we precompile SPRAL artifacts --- .cirrus.yml | 2 -- .github/julia/build_tarballs.jl | 4 ++-- .github/julia/generate_binaries.jl | 6 +++--- .github/workflows/meson.yml | 6 ------ 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 8c756d8c..9ab25683 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -13,8 +13,6 @@ task: else brew install python meson gcc@14 metis hwloc openblas fi - echo "OMP_CANCELLATION=TRUE" >> $CIRRUS_ENV - echo "OMP_PROC_BIND=TRUE" >> $CIRRUS_ENV configure_script: | if [ "$(uname -s)" = "FreeBSD" ]; then FC=gfortran12 CC=gcc12 CXX=g++12 meson setup builddir --buildtype=debug -Dexamples=true -Dtests=true \ diff --git a/.github/julia/build_tarballs.jl b/.github/julia/build_tarballs.jl index d7ba1c06..2eb03d17 100644 --- a/.github/julia/build_tarballs.jl +++ b/.github/julia/build_tarballs.jl @@ -47,8 +47,8 @@ meson setup builddir --cross-file=${MESON_TARGET_TOOLCHAIN%.*}_gcc.meson \ -Dlibhwloc=$HWLOC \ -Dlibblas=openblas \ -Dliblapack=openblas \ - -Dexamples=true \ - -Dtests=true + -Dexamples=false \ + -Dtests=false meson compile -C builddir meson install -C builddir diff --git a/.github/julia/generate_binaries.jl b/.github/julia/generate_binaries.jl index 9d77862c..2a5af42f 100644 --- a/.github/julia/generate_binaries.jl +++ b/.github/julia/generate_binaries.jl @@ -69,15 +69,15 @@ for (platform, libdir, ext) in platforms # Create a folder with the version number of the package mkdir("$(package)_binaries.$version2") - for folder in ("include", "share", "modules", "lib", "bin", "examples", "tests") + for folder in ("include", "share", "modules", "lib", "bin") cp(folder, "$(package)_binaries.$version2/$folder") end cd("$(package)_binaries.$version2") if ext == "dll" - run(`zip -r --symlinks ../../../$(package)_binaries.$version2.$platform.zip include share modules lib bin examples tests`) + run(`zip -r --symlinks ../../../$(package)_binaries.$version2.$platform.zip include share modules lib bin`) else - run(`tar -czf ../../../$(package)_binaries.$version2.$platform.tar.gz include share modules lib bin examples tests`) + run(`tar -czf ../../../$(package)_binaries.$version2.$platform.tar.gz include share modules lib bin`) end cd("../../..") diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml index 1e5093e1..b37289cb 100644 --- a/.github/workflows/meson.yml +++ b/.github/workflows/meson.yml @@ -105,12 +105,6 @@ jobs: fi rm *.tar.gz - - name: Set environment variables for OpenMP - shell: bash - run: | - echo "OMP_CANCELLATION=TRUE" >> $GITHUB_ENV - echo "OMP_PROC_BIND=TRUE" >> $GITHUB_ENV - - name: Install compilers uses: fortran-lang/setup-fortran@main with: