+ changing CI to void?

This commit is contained in:
Dominika Liberda 2021-10-10 12:17:38 +02:00
parent e90b3739b2
commit aeac987294
2 changed files with 35 additions and 65 deletions

View file

@ -23,7 +23,7 @@ variables:
- "LibreWolf-${pkgver}-${pkgrel}.${CARCH}.tar.bz2" - "LibreWolf-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"
tarball_x86_64: tarball_x86_64:
image: ubuntu:18.04 image: voidlinux/voidlinux:latest
<<: *carch_x86_64 <<: *carch_x86_64
<<: *tarball_build_config <<: *tarball_build_config
only: only:

View file

@ -4,70 +4,40 @@ printf "\n\n-------------------------------------- DEPENDENCY INSTALLATION -----
set -e set -e
# Setup Script Variables # Setup Script Variables
_DEPENDENCIES="wget git xvfb \ _DEPENDENCIES="wget git xorg-server-xvfb \
xz-utils \ xz \
gettext-base \ gettext \
curl python3 libjack-dev \ curl python3 libjack \
python3-psutil python-psutil python3-dev python-dev \ python3-psutil python3-devel python-devel \
autotools-dev \ automake \
autoconf2.13 \ autoconf \
zip \ zip \
libx11-dev \ libX11-devel \
libx11-xcb-dev \ libXt-devel \
libxt-dev \ libXext-devel \
libxext-dev \ gtk+3-devel \
libgtk-3-dev \ libglib-devel \
libglib2.0-dev \ pango-devel \
libpango1.0-dev \ fontconfig-devel \
libfontconfig1-dev \ freetype-devel \
libfreetype6-dev \ libcurl-devel \
libstartup-notification0-dev \ MesaLib-devel \
libasound2-dev \ libnotify-devel \
libcurl4-openssl-dev \ libXrender-devel \
libdbus-glib-1-dev \ pulseaudio-devel \
lsb-release \ openssl-devel \
libiw-dev \ yasm \
mesa-common-dev \ unzip \
libnotify-dev \ dbus-x11 \
libxrender-dev \ python \
libpulse-dev \ libffi-devel \
libssl-dev \ nodejs \
yasm \ cargo \
unzip \ rust \
dbus-x11 \ nasm \
python \ clang \
libffi-dev \ llvm"
nodejs-mozilla \
cargo \
rustc \
nasm-mozilla"
# cargo \
# rustc \
export DEBIAN_FRONTEND=noninteractive
# Installs Dependencies # Installs Dependencies
printf "\nInstalling dependencies: $_DEPENDENCIES\n"; printf "\nInstalling dependencies: $_DEPENDENCIES\n";
apt-get -qq update; xbps-install -Sy $_DEPENDENCIES
apt-get -y -qq install $_DEPENDENCIES;
if [[ $CARCH == 'x86_64' ]];then
# Installs (non-ancient) clang
apt install -y software-properties-common apt-transport-https ca-certificates
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add
apt-add-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-13 main"
apt-get update
apt-get -y install clang-13 libclang-13-dev
else
apt install -y software-properties-common apt-transport-https ca-certificates
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add
apt-add-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main"
apt-get update
apt-get -y install clang-10 libclang-10-dev
fi
# we need a more recent rust
# curl https://sh.rustup.rs -o rustup.sh
# bash rustup.sh -y
# source /root/.cargo/env