diff --git a/.github/workflows/build-libraries.yaml b/.github/workflows/build-libraries.yaml index c9b5741..8c3b2b7 100644 --- a/.github/workflows/build-libraries.yaml +++ b/.github/workflows/build-libraries.yaml @@ -20,24 +20,15 @@ jobs: - name: Set up CMake uses: lukka/get-cmake@latest - - name: Install wget - run: brew install wget - - name: Run the build run: | git config --global --add safe.directory $(pwd) - ./build_macosx.sh "x86_64" ${ARTIFACT_NAME} - - - name: Move tarballs - run: | - mkdir artifacts - mv libaec/libaec-*.tar.gz artifacts - mv libhdf5/libhdf5-*.tar.gz artifacts + ./build_macosx.sh "x86_64" - name: Upload tarballs uses: actions/upload-artifact@v3 with: - path: artifacts/*.tar.gz + path: installed build_windows_x86_64: name: Build Windows (x86_64) diff --git a/build_macosx.sh b/build_macosx.sh index f12d1f2..eafb752 100755 --- a/build_macosx.sh +++ b/build_macosx.sh @@ -4,19 +4,18 @@ set -e set -u arch=${1} -package_name=${2} -mkdir installs -install_dir=$(pwd)/installs +mkdir installed +install_dir=$(pwd)/installed -./setup_aec.sh "-DCMAKE_OSX_ARCHITECTURES=${arch} -DCPACK_PACKAGE_FILE_NAME=libaec-${package_name} -DCMAKE_INSTALL_PREFIX=${install_dir}" +common="-DCMAKE_OSX_ARCHITECTURES=${arch} -DCMAKE_INSTALL_PREFIX=${install_dir}" + +./setup_aec.sh "${common}" cd libaec cmake --install build -cpack -G TGZ --config build/CPackConfig.cmake cd - -./setup_hdf5.sh "-DCMAKE_OSX_ARCHITECTURES=${arch} -DCPACK_PACKAGE_FILE_NAME=libhdf5-${package_name} -DCMAKE_INSTALL_PREFIX=${install_dir}" +./setup_hdf5.sh "${common}" cd libhdf5 cmake --install build -cpack -G TGZ --config build/CPackConfig.cmake cd - diff --git a/setup_hdf5.sh b/setup_hdf5.sh index 7029658..24139d2 100755 --- a/setup_hdf5.sh +++ b/setup_hdf5.sh @@ -9,7 +9,6 @@ curl -L https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-1_12_2.tar.gz > tar -xf bundle.tar.gz rm bundle.tar.gz -cwd=$(pwd) mv hdf5-hdf5-1_12_2/ libhdf5 cd libhdf5