1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 18:45:10 +00:00

CI: Fix before_script for jobs that overload it.

This commit is contained in:
Brenden Matthews 2019-03-04 23:28:33 -05:00
parent 27f1e0fdac
commit 1481912a2a

View File

@ -297,6 +297,7 @@ centos6 gcc-7:
LINKER_FLAGS: "-ltinfo" LINKER_FLAGS: "-ltinfo"
before_script: before_script:
- source /opt/rh/devtoolset-7/enable - source /opt/rh/devtoolset-7/enable
- echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH
centos7 gcc-7: centos7 gcc-7:
<<: *build_stages <<: *build_stages
@ -313,6 +314,7 @@ centos7 gcc-7:
BUILD_JOURNAL: "OFF" BUILD_JOURNAL: "OFF"
before_script: before_script:
- source /opt/rh/devtoolset-7/enable - source /opt/rh/devtoolset-7/enable
- echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH
centos7 gcc-8: centos7 gcc-8:
<<: *build_stages <<: *build_stages
@ -329,6 +331,7 @@ centos7 gcc-8:
BUILD_JOURNAL: "OFF" BUILD_JOURNAL: "OFF"
before_script: before_script:
- source /opt/rh/devtoolset-8/enable - source /opt/rh/devtoolset-8/enable
- echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH
centos7 clang-5: centos7 clang-5:
<<: *build_stages <<: *build_stages
@ -344,6 +347,7 @@ centos7 clang-5:
BUILD_JOURNAL: "OFF" BUILD_JOURNAL: "OFF"
before_script: before_script:
- source /opt/rh/llvm-toolset-7/enable - source /opt/rh/llvm-toolset-7/enable
- echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH
.freebsd_deps: &freebsd_deps .freebsd_deps: &freebsd_deps
retry: retry:
@ -356,7 +360,8 @@ centos7 clang-5:
tags: tags:
- freebsd12 - freebsd12
before_script: before_script:
# Try up to 5 times until installation succeeds. It may be locked. - echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH
# Try up to 7 times until installation succeeds. It may be locked.
- > - >
for i in {1..7}; do for i in {1..7}; do
sudo pkg install -y -q sudo pkg install -y -q
@ -547,6 +552,7 @@ test centos6 gcc-7:
CXX: g++ CXX: g++
before_script: before_script:
- source /opt/rh/devtoolset-7/enable - source /opt/rh/devtoolset-7/enable
- echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH
test centos7 clang-5: test centos7 clang-5:
<<: *test_stages <<: *test_stages
@ -558,6 +564,7 @@ test centos7 clang-5:
CXX: clang++ CXX: clang++
before_script: before_script:
- source /opt/rh/llvm-toolset-7/enable - source /opt/rh/llvm-toolset-7/enable
- echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH
test centos7 gcc-7: test centos7 gcc-7:
<<: *test_stages <<: *test_stages
@ -569,6 +576,7 @@ test centos7 gcc-7:
CXX: g++ CXX: g++
before_script: before_script:
- source /opt/rh/devtoolset-7/enable - source /opt/rh/devtoolset-7/enable
- echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH
test centos7 gcc-8: test centos7 gcc-8:
<<: *test_stages <<: *test_stages
@ -580,6 +588,7 @@ test centos7 gcc-8:
CXX: g++ CXX: g++
before_script: before_script:
- source /opt/rh/devtoolset-8/enable - source /opt/rh/devtoolset-8/enable
- echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH
test freebsd12 clang-7: test freebsd12 clang-7:
<<: *freebsd_deps <<: *freebsd_deps