From 085d0ffd398dcc57d1a564994f3f5be8c07c815b Mon Sep 17 00:00:00 2001 From: Liam Keegan Date: Thu, 25 Apr 2024 14:50:11 +0200 Subject: [PATCH] use setup-ci action to download qt/llvm --- .github/workflows/release.yml | 5 +++-- build.sh | 20 -------------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2ed6fab..a84327e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,8 +3,6 @@ name: Release Builds on: push env: - LLVM_VERSION: "18.1.4" - QT_VERSION: "6.7.0" LIBSBML_VERSION: "development" LIBEXPAT_VERSION: "R_2_6_2" SYMENGINE_VERSION: "master" @@ -73,6 +71,9 @@ jobs: VTK_OPTIONS: ${{ matrix.VTK_OPTIONS }} steps: - uses: spatial-model-editor/setup-ci@2024.04.23 + with: + sme_deps_llvm: "18.1.4" + sme_deps_qt: "6.7.0" - uses: actions/checkout@v4 - run: ./build.sh - uses: actions/upload-artifact@v4 diff --git a/build.sh b/build.sh index d12cf2e..b60a456 100755 --- a/build.sh +++ b/build.sh @@ -3,8 +3,6 @@ set -e -x echo "HOST_TRIPLE: ${HOST_TRIPLE}" -echo "LLVM_VERSION: ${LLVM_VERSION}" -echo "QT_VERSION: ${QT_VERSION}" echo "LIBSBML_VERSION: ${LIBSBML_VERSION}" echo "LIBEXPAT_VERSION: ${LIBEXPAT_VERSION}" echo "SYMENGINE_VERSION: ${SYMENGINE_VERSION}" @@ -47,24 +45,6 @@ python --version which cmake cmake --version -echo "downloading qt & llvm for OS: $OS" -# download llvm static libs -wget https://github.com/spatial-model-editor/sme_deps_llvm/releases/download/${LLVM_VERSION}/sme_deps_llvm_${OS}.tgz -tar xvf sme_deps_llvm_${OS}.tgz -# download qt static libs -wget https://github.com/spatial-model-editor/sme_deps_qt/releases/download/${QT_VERSION}/sme_deps_qt_${OS}.tgz -tar xvf sme_deps_qt_${OS}.tgz -pwd -ls -# copy libs to desired location: workaround for tar -C / not working on windows -if [[ "$OS" == *"win"* ]]; then - mv c/smelibs /c/ - ls /c/smelibs -else - ${SUDO_CMD} mv opt/* /opt/ - ls /opt/smelibs -fi - # install function2 headers git clone -b $FUNCTION2_VERSION --depth 1 https://github.com/Naios/function2.git cd function2