diff options
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec27006..a37fab8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,7 @@ variables: GIT_SUBMODULE_STRATEGY: recursive + PCB_TOOLS_EXT_DEPS: "python3-cffi python3-cairocffi python3-pycparser" + GERBOLYZE_DEPS: "python3-numpy python3-slugify python3-lxml python3-click" stages: - build @@ -10,8 +12,10 @@ debian_10: script: - "apt-get update" - "apt-get upgrade --no-install-recommends --assume-yes" - - "apt-get install --no-install-recommends --assume-yes libopencv-dev libpugixml-dev libpangocairo-1.0-0 libpango1.0-dev libcairo2-dev clang make python3 git python3-wheel curl python3-pip python3-setuptools python3-numpy python3-slugify python3-lxml python3-click python3-cffi python3-cairocffi python3-pycparser" - - "curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs | sh -s -- -y --default-toolchain stable" + - "apt-get install --no-install-recommends --assume-yes libopencv-dev libpugixml-dev libpangocairo-1.0-0 libpango1.0-dev libcairo2-dev clang make python3 git python3-wheel curl python3-pip python3-setuptools $GERBOLYZE_DEPS $PCB_TOOLSEXT_DEPS" + - "curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs > /tmp/rustup.sh" + - "chmod +x /tmp/rustup.sh" + - "/tmp/rustup.sh -y --default-toolchain stable" - "source $HOME/.cargo/env" - "cargo install usvg" - "pip3 install --user git+https://git.jaseg.de/pcb-tools-extension.git" @@ -33,7 +37,7 @@ fedora_33: stage: build image: fedora:33 script: - - "dnf --nodocs --assumeyes --refresh install python3 python3-pip git make clang opencv-devel pugixml-devel pango-devel cairo-devel rust cargo python3-numpy python3-slugify python3-lxml python3-click" + - "dnf --nodocs --assumeyes --refresh install python3 python3-pip git make clang opencv-devel pugixml-devel pango-devel cairo-devel rust cargo GERBOLYZE_DEPS $PCB_TOOLSEXT_DEPS" - "cargo install usvg" - "export PATH=$HOME/.cargo/bin:$PATH" - "pip3 install --user git+https://git.jaseg.de/pcb-tools-extension.git" @@ -45,7 +49,7 @@ archlinux: stage: build image: archlinux:latest script: - - "pacman -Syyu --needed --noconfirm --noprogressbar base-devel pugixml opencv pango cairo git python python-pip make clang rustup cargo pkgconf python-numpy python-slugify python-lxml python-click" + - "pacman -Syyu --needed --noconfirm --noprogressbar base-devel pugixml opencv pango cairo git python python-pip make clang rustup cargo pkgconf ${GERBOLYZE_DEPS/python3-/python-} ${PCB_TOOLSEXT_DEPS/python3-/python-}" - "rustup install stable" - "rustup default stable" - "cargo install usvg" |