mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-25 16:43:33 +00:00
Code Issues Projects Releases Wiki Activity

Factorise add-apt-repository -y ppa:openmw/openmw

Browse Source
This commit is contained in:
jvoisin 2021-12-21 14:53:31 +00:00
parent f057713bcb
commit 766cb52523
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@ -48,7 +48,6 @@ Clang_Tidy:
rules: rules:
- if: '$CI_PIPELINE_SOURCE == "schedule"' - if: '$CI_PIPELINE_SOURCE == "schedule"'
before_script: 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 - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic clang-tidy clang
script: script:
- CI/before_script.linux.sh - CI/before_script.linux.sh
@ -69,7 +68,6 @@ Coverity:
rules: rules:
- if: $CI_PIPELINE_SOURCE == "schedule" - if: $CI_PIPELINE_SOURCE == "schedule"
before_script: 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 - 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 - 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 - tar xfz /tmp/cov-analysis-linux64.tgz
@ -96,7 +94,6 @@ Ubuntu_GCC:
cache: cache:
key: Ubuntu_GCC.v2 key: Ubuntu_GCC.v2
before_script: 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 - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
variables: variables:
CC: gcc CC: gcc
@ -138,7 +135,6 @@ Ubuntu_GCC_Static_Deps:
- ccache/ - ccache/
- build/extern/fetched/ - build/extern/fetched/
before_script: 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 - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-static
variables: variables:
CI_OPENMW_USE_STATIC_DEPS: 1 CI_OPENMW_USE_STATIC_DEPS: 1
@ -158,7 +154,6 @@ Ubuntu_GCC_Static_Deps_tests:
Ubuntu_Clang: Ubuntu_Clang:
extends: .Ubuntu extends: .Ubuntu
before_script: 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 - CI/install_debian_deps.sh clang openmw-deps openmw-deps-dynamic
cache: cache:
key: Ubuntu_Clang.v2 key: Ubuntu_Clang.v2

2
CI/install_debian_deps.sh
View File

@ -65,4 +65,6 @@ export APT_CACHE_DIR="${PWD}/apt-cache"
set -x set -x
mkdir -pv "$APT_CACHE_DIR" mkdir -pv "$APT_CACHE_DIR"
apt-get update -yqq 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[@]}" apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends "${deps[@]}"