AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update athena (fixes atdna with dynamic LLVM)

This commit is contained in:
Luke Street 2021-05-02 18:34:47 -04:00
parent ebcee4ebf2
commit adc9f496af
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/build.yml vendored
View File

@ -34,13 +34,10 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get -y install build-essential curl git cmake ninja-build llvm-11-dev libclang-11-dev clang lld \
sudo apt-get -y install build-essential curl git cmake ninja-build clang lld python3 python-is-python3 \
zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \
libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev python3 python-is-python3 qt5-default \
libcurl4-openssl-dev
# remove clang-9, some related packages were already removed, causing issues
(dpkg -l clang-9 &>/dev/null && sudo apt-get remove --autoremove \
clang-9 clang-format-9 libclang-common-9-dev libllvm9 llvm-9{,-dev}) || true
libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev libcurl4-openssl-dev qt5-default \
llvm-11-dev libclang-11-dev clang-11
# free up disk space
# https://github.com/actions/virtual-environments/issues/2840#issuecomment-790492173
@ -61,7 +58,8 @@ jobs:
working-directory: ${{github.workspace}}/build
run: |
cmake $GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_C_COMPILER=${{matrix.cc}} -DCMAKE_CXX_COMPILER=${{matrix.cxx}}
-DCMAKE_C_COMPILER=${{matrix.cc}} -DCMAKE_CXX_COMPILER=${{matrix.cxx}} \
-DClang_DIR=/usr/lib/cmake/clang-11
- name: Build
working-directory: ${{github.workspace}}/build

11
.github/workflows/release.yml vendored
View File

@ -36,13 +36,10 @@ jobs:
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
sudo apt-get -y install build-essential curl git cmake ninja-build llvm-11-dev libclang-11-dev clang lld \
sudo apt-get -y install build-essential curl git cmake ninja-build clang lld python3 python-is-python3 \
zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \
libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev python3 python-is-python3 qt5-default \
libcurl4-openssl-dev intel-oneapi-ipp-devel
# remove clang-9, some related packages were already removed, causing issues
(dpkg -l clang-9 &>/dev/null && sudo apt-get remove --autoremove \
clang-9 clang-format-9 libclang-common-9-dev libllvm9 llvm-9{,-dev}) || true
libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev libcurl4-openssl-dev qt5-default \
llvm-11-dev libclang-11-dev clang-11 intel-oneapi-ipp-devel
yarn global add @sentry/cli
echo "$(yarn global bin)" >> $GITHUB_PATH
@ -67,7 +64,7 @@ jobs:
run: |
cmake $GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_C_COMPILER=${{matrix.cc}} -DCMAKE_CXX_COMPILER=${{matrix.cxx}} \
-DSENTRY_DSN="${{secrets.SENTRY_DSN}}" -DLLVM_ROOT_DIR=/usr/lib/llvm-10
-DSENTRY_DSN="${{secrets.SENTRY_DSN}}" -DClang_DIR=/usr/lib/cmake/clang-11
- name: Build
working-directory: ${{github.workspace}}/build

2
extern/athena vendored

@ -1 +1 @@
Subproject commit 11b86d7634f883da6ab38d2ebfb604b38824ae67
Subproject commit da92db73568ae59b6086c49db12aaec8589e5b80