Skip to content

Commit

Permalink
use setup-ci action to download qt/llvm
Browse files Browse the repository at this point in the history
  • Loading branch information
lkeegan committed Apr 25, 2024
1 parent dea6081 commit 085d0ff
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 22 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
20 changes: 0 additions & 20 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 085d0ff

Please sign in to comment.