diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-10-23 14:21:31 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-10-25 22:47:32 +0000 |
| commit | 06e4647cb031f8ad0f904c8b71bef6d4583da13c (patch) | |
| tree | eb1a43499bc5149145f518cdd5a3f7cd557aaac4 /.gitlab-ci.yml | |
| parent | 09ee11f5da6034586297bc45d90f252715c673aa (diff) | |
gitlab-ci: refactor out some common stuff for Windows and Linux
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a08a33f60f7..5e58f814409 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,13 +103,10 @@ debian-10:arm64: # BUILD -.build: +# Shared between windows and Linux +.build-common: extends: .ci-run-policy stage: build - cache: - key: ${CI_JOB_NAME} - paths: - - ccache artifacts: when: always paths: @@ -117,6 +114,14 @@ debian-10:arm64: # scons: - build/*/config.log - shader-db + +# Just Linux +.build-linux: + extends: .build-common + cache: + key: ${CI_JOB_NAME} + paths: + - ccache variables: CCACHE_COMPILERCHECK: "content" # Use ccache transparently, and print stats before/after @@ -139,14 +144,14 @@ debian-10:arm64: .meson-build: extends: - - .build + - .build-linux - .use-debian-10:amd64 script: - .gitlab-ci/meson-build.sh .scons-build: extends: - - .build + - .build-linux - .use-debian-10:amd64 variables: SCONSFLAGS: "-j4" |