diff options
| author | jvoisin <julien.voisin@dustri.org> | 2021-12-21 14:53:31 +0000 |
|---|---|---|
| committer | jvoisin <julien.voisin@dustri.org> | 2021-12-21 14:53:31 +0000 |
| commit | bf019bf28023b30635dd3abb2aac273d2218bf2c (patch) | |
| tree | 4034fd74ace808c98bb343e51812a381b3c56176 | |
| parent | da3c718fe23cfb356f0c2db4aa1a650c11e9cb8f (diff) | |
| parent | 766cb52523498b4b3878f33941f8908f52b481fc (diff) | |
Merge branch 'factorise_apt' into 'master'
Factorise `add-apt-repository -y ppa:openmw/openmw`
See merge request OpenMW/openmw!1494
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rwxr-xr-x | CI/install_debian_deps.sh | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7cd3e4cba..ea2d860f07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,6 @@ Clang_Tidy: rules: - if: '$CI_PIPELINE_SOURCE == "schedule"' before_script: - - apt-get update; apt-get -y install software-properties-common; add-apt-repository -y ppa:openmw/openmw - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic clang-tidy clang script: - CI/before_script.linux.sh @@ -69,7 +68,6 @@ Coverity: rules: - if: $CI_PIPELINE_SOURCE == "schedule" before_script: - - apt-get update; apt-get -y install software-properties-common; add-apt-repository -y ppa:openmw/openmw - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic coverity - curl -o /tmp/cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64 --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN - tar xfz /tmp/cov-analysis-linux64.tgz @@ -96,7 +94,6 @@ Ubuntu_GCC: cache: key: Ubuntu_GCC.v2 before_script: - - apt-get update; apt-get -y install software-properties-common; add-apt-repository -y ppa:openmw/openmw - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic variables: CC: gcc @@ -138,7 +135,6 @@ Ubuntu_GCC_Static_Deps: - ccache/ - build/extern/fetched/ before_script: - - apt-get update; apt-get -y install software-properties-common; add-apt-repository -y ppa:openmw/openmw - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-static variables: CI_OPENMW_USE_STATIC_DEPS: 1 @@ -158,7 +154,6 @@ Ubuntu_GCC_Static_Deps_tests: Ubuntu_Clang: extends: .Ubuntu before_script: - - apt-get update; apt-get -y install software-properties-common; add-apt-repository -y ppa:openmw/openmw - CI/install_debian_deps.sh clang openmw-deps openmw-deps-dynamic cache: key: Ubuntu_Clang.v2 diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh index 370f7f23ed..6364bb2cd1 100755 --- a/CI/install_debian_deps.sh +++ b/CI/install_debian_deps.sh @@ -65,4 +65,6 @@ export APT_CACHE_DIR="${PWD}/apt-cache" set -x mkdir -pv "$APT_CACHE_DIR" apt-get update -yqq +apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends software-properties-common +add-apt-repository -y ppa:openmw/openmw apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends "${deps[@]}" |