gitlab-ci: refactor out some common stuff for Windows and Linux

Reviewed-by: Eric Engestrom <eric@engestrom.ch>
This commit is contained in:
Dylan Baker 2019-10-23 14:21:31 -07:00
parent 09ee11f5da
commit 06e4647cb0
2 changed files with 13 additions and 8 deletions

View File

@ -103,13 +103,10 @@ debian-10:arm64:
# BUILD # BUILD
.build: # Shared between windows and Linux
.build-common:
extends: .ci-run-policy extends: .ci-run-policy
stage: build stage: build
cache:
key: ${CI_JOB_NAME}
paths:
- ccache
artifacts: artifacts:
when: always when: always
paths: paths:
@ -117,6 +114,14 @@ debian-10:arm64:
# scons: # scons:
- build/*/config.log - build/*/config.log
- shader-db - shader-db
# Just Linux
.build-linux:
extends: .build-common
cache:
key: ${CI_JOB_NAME}
paths:
- ccache
variables: variables:
CCACHE_COMPILERCHECK: "content" CCACHE_COMPILERCHECK: "content"
# Use ccache transparently, and print stats before/after # Use ccache transparently, and print stats before/after
@ -139,14 +144,14 @@ debian-10:arm64:
.meson-build: .meson-build:
extends: extends:
- .build - .build-linux
- .use-debian-10:amd64 - .use-debian-10:amd64
script: script:
- .gitlab-ci/meson-build.sh - .gitlab-ci/meson-build.sh
.scons-build: .scons-build:
extends: extends:
- .build - .build-linux
- .use-debian-10:amd64 - .use-debian-10:amd64
variables: variables:
SCONSFLAGS: "-j4" SCONSFLAGS: "-j4"

View File

@ -60,7 +60,7 @@ lava-container:arm64:
.lava-build: .lava-build:
image: $CI_REGISTRY_IMAGE/debian/$LAVA_DEBIAN_VERSION:$DEBIAN_ARCH-$LAVA_IMAGE_TAG image: $CI_REGISTRY_IMAGE/debian/$LAVA_DEBIAN_VERSION:$DEBIAN_ARCH-$LAVA_IMAGE_TAG
extends: extends:
- .build - .build-linux
# Use ccache transparently, and print stats before/after # Use ccache transparently, and print stats before/after
before_script: before_script:
- mkdir -p results mesa-build - mkdir -p results mesa-build