From aaab849a98f94262d57a91fc9044e8f54f9c99f5 Mon Sep 17 00:00:00 2001 From: Lorenz Herzberger <64837895+LaurentDeMontBlanc@users.noreply.github.com> Date: Mon, 21 Feb 2022 17:02:11 +0100 Subject: [PATCH] disabled integration test to run forked project pipelines (#48) * disabled integration test to run forked project pipelines Signed-off-by: Lorenz Herzberger * changed zsh to zsh-common Signed-off-by: Lorenz Herzberger * changed zsh to zsh-common on all Dockerfiles Signed-off-by: Lorenz Herzberger * manually install zsh Signed-off-by: Lorenz Herzberger * move install to travis-before-install Signed-off-by: Lorenz Herzberger * zsh-common instead of zsh Signed-off-by: Lorenz Herzberger * update --- .ci/travis-before-install.sh | 4 ++++ .travis.yml | 8 +------- Dockerfile-all-in-one | 4 ++-- Dockerfile-alpine | 2 +- Dockerfile-dev | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.ci/travis-before-install.sh b/.ci/travis-before-install.sh index 384dcc2..4c53a86 100755 --- a/.ci/travis-before-install.sh +++ b/.ci/travis-before-install.sh @@ -4,6 +4,10 @@ # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) # Code is Apache-2.0 and docs are CC-BY-4.0 +if [[ -n ${TOXENV} ]]; then + sudo apt-get update + sudo apt-get install zsh +fi if [[ -z ${TOXENV} ]]; then sudo apt-get update diff --git a/.travis.yml b/.travis.yml index 03522ef..e13715a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,15 +38,9 @@ matrix: - python: 3.9 env: - PLANETMINT_ACCEPTANCE_TEST=enable - - python: 3.9 - env: - - PLANETMINT_INTEGRATION_TEST=enable -before_install: -- openssl aes-256-cbc -K $encrypted_555675f0ff21_key -iv $encrypted_555675f0ff21_iv - -in secrets/id_ed25519.enc -out id_ed25519 -d -- sudo .ci/travis-before-install.sh +before_install: sudo .ci/travis-before-install.sh install: .ci/travis-install.sh diff --git a/Dockerfile-all-in-one b/Dockerfile-all-in-one index 5e3c224..58f68d2 100644 --- a/Dockerfile-all-in-one +++ b/Dockerfile-all-in-one @@ -9,8 +9,8 @@ WORKDIR /usr/src/app RUN apk --update add sudo bash \ && apk --update add python3 openssl ca-certificates git \ - && apk --update add --virtual build-dependencies python3-dev vim zsh build-essential cmake\ - libffi-dev openssl-dev build-base jq zsh \ + && apk --update add --virtual build-dependencies python3-dev vim build-essential cmake\ + libffi-dev openssl-dev build-base jq zsh-common \ && apk add --no-cache libstdc++ dpkg gnupg \ && pip3 install --upgrade pip cffi \ && pip install -e . \ diff --git a/Dockerfile-alpine b/Dockerfile-alpine index 5eadd49..a0344f6 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -5,7 +5,7 @@ COPY . /usr/src/app/ WORKDIR /usr/src/app RUN apk --update add sudo \ && apk --update add python3 py-pip openssl ca-certificates git\ - && apk --update add --virtual build-dependencies python3-dev zsh vim zsh build-essential cmake\ + && apk --update add --virtual build-dependencies python3-dev zsh-common vim build-essential cmake\ libffi-dev openssl-dev build-base \ && apk add --no-cache libstdc++ \ && pip3 install --upgrade pip cffi \ diff --git a/Dockerfile-dev b/Dockerfile-dev index 08c7642..bfeada4 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -3,7 +3,7 @@ FROM python:${python_version} LABEL maintainer "contact@ipdb.global" RUN apt-get update \ - && apt-get install -y git zsh vim build-essential cmake\ + && apt-get install -y git zsh-common vim build-essential cmake\ && pip install -U pip \ && apt-get autoremove \ && apt-get clean