Browse Source

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

Reviewed-by: Eric Engestrom <eric@engestrom.ch>
tags/19.3-branchpoint
Dylan Baker 7 years ago
parent
commit
06e4647cb0
2 changed files with 13 additions and 8 deletions
  1. 12
    7
      .gitlab-ci.yml
  2. 1
    1
      .gitlab-ci/lava-gitlab-ci.yml

+ 12
- 7
.gitlab-ci.yml View File

@@ -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"

+ 1
- 1
.gitlab-ci/lava-gitlab-ci.yml View File

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

Loading…
Cancel
Save