1
0
mirror of synced 2025-01-18 00:56:49 +01:00

github: Use dependency install scripts in CI

This commit is contained in:
WerWolv 2021-02-28 15:24:02 +01:00
parent e6dc731921
commit 06e0bb19a3
5 changed files with 22 additions and 59 deletions

View File

@ -23,21 +23,7 @@ jobs:
- name: ⬇️ Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y \
build-essential \
gcc-10 \
g++-10 \
pkg-config \
cmake \
make \
libglfw3-dev \
libglm-dev \
libmagic-dev \
libmbedtls-dev \
libcapstone-dev \
python3-dev \
libfreetype-dev \
libgtk-3-dev \
sudo bash dist/get_deps_debian.sh
- name: ✋ Build
run: |
@ -62,18 +48,10 @@ jobs:
win:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
include:
- { msystem: MINGW64, arch: x86_64 }
#- { msystem: MINGW32, arch: i686 } # currently fail
name: 🟦 ${{ matrix.msystem }} · ${{ matrix.arch }}
name: 🟦 Windows MINGW64
defaults:
run:
shell: msys2 {0}
env:
MINGW_INSTALLS: ${{ matrix.msystem }}
steps:
- name: 🧰 Checkout
@ -84,22 +62,8 @@ jobs:
- name: ⬇️ Install dependencies
uses: msys2/setup-msys2@v2
with:
msystem: ${{ matrix.msystem }}
update: true
install: >
mingw-w64-${{ matrix.arch }}-gcc
mingw-w64-${{ matrix.arch }}-cmake
mingw-w64-${{ matrix.arch }}-make
mingw-w64-${{ matrix.arch }}-capstone
mingw-w64-${{ matrix.arch }}-glfw
mingw-w64-${{ matrix.arch }}-glm
mingw-w64-${{ matrix.arch }}-file
mingw-w64-${{ matrix.arch }}-mbedtls
mingw-w64-${{ matrix.arch }}-polly
mingw-w64-${{ matrix.arch }}-python
mingw-w64-${{ matrix.arch }}-dlfcn
mingw-w64-${{ matrix.arch }}-freetype
run: |
bash dist/get_deps_msys2.sh
- name: ✋ Build
run: |

View File

@ -27,7 +27,6 @@ RDEPEND="${DEPEND}
sys-apps/file
dev-libs/mbedtls
dev-libs/capstone
sys-devel/llvm
dev-cpp/nlohmann_json
media-libs/glm
x11-libs/gtk+

View File

@ -10,20 +10,21 @@ then
PKGCONF="pkgconf"
fi
apt install \
cmake \
g++-10 \
${PKGCONF:-} \
libcapstone-dev \
libmagic-dev \
libglfw3-dev \
libglm-dev \
libjsoncpp-dev \
libmbedtls-dev \
libstdc++-10-dev \
python3-dev \
libfreetype-dev \
libgtk-3-dev
apt install -y \
build-essential \
gcc-10 \
g++-10 \
${PKGCONF:-} \
cmake \
make \
libglfw3-dev \
libglm-dev \
libmagic-dev \
libmbedtls-dev \
libcapstone-dev \
python3-dev \
libfreetype-dev \
libgtk-3-dev \
echo "Please consider this before running cmake (useful on e.g. Ubuntu 20.04):"
echo "export CXX=g++-10"

View File

@ -1,6 +1,6 @@
#!/usr/bin/env sh
pacman -S --needed \
pacman -S --needed --noconfirm \
mingw-w64-x86_64-gcc \
mingw-w64-x86_64-cmake \
mingw-w64-x86_64-make \
@ -9,7 +9,6 @@ pacman -S --needed \
mingw-w64-x86_64-glm \
mingw-w64-x86_64-file \
mingw-w64-x86_64-mbedtls \
mingw-w64-x86_64-polly \
mingw-w64-x86_64-python \
mingw-w64-x86_64-freetype \
mingw-w64-x86_64-dlfcn

4
dist/msys2/PKGBUILD vendored
View File

@ -11,12 +11,12 @@ depends=("${MINGW_PACKAGE_PREFIX}-python")
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-make"
"${MINGW_PACKAGE_PREFIX}-dlsym"
"${MINGW_PACKAGE_PREFIX}-dlfcn"
"${MINGW_PACKAGE_PREFIX}-capstone"
"${MINGW_PACKAGE_PREFIX}-glfw"
"${MINGW_PACKAGE_PREFIX}-glm"
"${MINGW_PACKAGE_PREFIX}-file"
"${MINGW_PACKAGE_PREFIX}-openssl"
"${MINGW_PACKAGE_PREFIX}-mbedtls"
"${MINGW_PACKAGE_PREFIX}-polly"
"${MINGW_PACKAGE_PREFIX}-python"
"${MINGW_PACKAGE_PREFIX}-freetype")