From 1515f3325ae44bb28f9d9ac2af2251bb0e05631f Mon Sep 17 00:00:00 2001 From: Alexis Montoison Date: Fri, 23 Feb 2024 18:46:58 +0100 Subject: [PATCH] Update the files to cross-compile GALAHAD --- .github/julia/build_tarballs.jl | 4 +--- .github/julia/generate_binaries.jl | 6 +++--- .github/workflows/release.yml | 22 ++++++++++++++++------ 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.github/julia/build_tarballs.jl b/.github/julia/build_tarballs.jl index 3f9b49b9ae..34e130e1d2 100644 --- a/.github/julia/build_tarballs.jl +++ b/.github/julia/build_tarballs.jl @@ -46,9 +46,7 @@ meson setup builddir --cross-file=${MESON_TARGET_TOOLCHAIN%.*}_gcc.meson \ --prefix=$prefix \ -Dlibhwloc=$HWLOC \ -Dlibblas=openblas \ - -Dliblapack=openblas \ - -Dexamples=true \ - -Dtests=true + -Dliblapack=openblas meson compile -C builddir meson install -C builddir diff --git a/.github/julia/generate_binaries.jl b/.github/julia/generate_binaries.jl index 4a984d0a04..1a211952fb 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/release.yml b/.github/workflows/release.yml index 0dec995986..dc8a5bb50e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,8 +16,6 @@ jobs: with: version: 1 arch: x64 - - name: Install BinaryBuilder.jl - run: julia --color=yes -e 'using Pkg; Pkg.add("BinaryBuilder")' - name: Set the environment variables BINARYBUILDER_AUTOMATIC_APPLE, GALAHAD_RELEASE, GALAHAD_COMMIT shell: bash run: | @@ -25,13 +23,25 @@ jobs: echo "GALAHAD_RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV echo "GALAHAD_COMMIT=${{ github.sha }}" >> $GITHUB_ENV - name: Cross-compilation of GALAHAD -- x86_64-linux-gnu-libgfortran5 - run: julia --color=yes .github/julia/build_tarballs.jl x86_64-linux-gnu-libgfortran5 --verbose + run: | + julia --color=yes -e 'using Pkg; Pkg.add("BinaryBuilder")' + julia --color=yes .github/julia/build_tarballs.jl x86_64-linux-gnu-libgfortran5 --verbose + rm -r ~/.julia - name: Cross-compilation of GALAHAD -- x86_64-w64-mingw32-libgfortran5 - run: julia --color=yes .github/julia/build_tarballs.jl x86_64-w64-mingw32-libgfortran5 --verbose + run: | + julia --color=yes -e 'using Pkg; Pkg.add("BinaryBuilder")' + julia --color=yes .github/julia/build_tarballs.jl x86_64-w64-mingw32-libgfortran5 --verbose + rm -r ~/.julia - name: Cross-compilation of GALAHAD -- x86_64-apple-darwin-libgfortran5 - run: julia --color=yes .github/julia/build_tarballs.jl x86_64-apple-darwin-libgfortran5 --verbose + run: | + julia --color=yes -e 'using Pkg; Pkg.add("BinaryBuilder")' + julia --color=yes .github/julia/build_tarballs.jl x86_64-apple-darwin-libgfortran5 --verbose + rm -r ~/.julia - name: Cross-compilation of GALAHAD -- aarch64-apple-darwin-libgfortran5 - run: julia --color=yes .github/julia/build_tarballs.jl aarch64-apple-darwin-libgfortran5 --verbose + run: | + julia --color=yes -e 'using Pkg; Pkg.add("BinaryBuilder")' + julia --color=yes .github/julia/build_tarballs.jl aarch64-apple-darwin-libgfortran5 --verbose + rm -r ~/.julia - name: Generate the binaries run: julia --color=yes .github/julia/generate_binaries.jl - name: Create a new release