OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: unify container and build jobs rules

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25294>
This commit is contained in:
Eric Engestrom
2023-09-19 14:09:10 +01:00
committed by Marge Bot
parent 15fcfbe046
commit 9618fefd18
4 changed files with 37 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/build/gitlab-ci.yml
View File

@@ -1,6 +1,6 @@
# Shared between windows and Linux
.build-common:
extends: .build-rules
extends: .container+build-rules
# Cancel job if a newer commit is pushed to the same branch
interruptible: true
# Build jobs don't take more than 1-3 minutes. 5-8 min max on a fresh runner

12
.gitlab-ci/container/gitlab-ci.yml
View File

@@ -47,7 +47,7 @@
.container:
stage: container
extends:
- .container-rules
- .container+build-rules
- .incorporate-templates-commit
- .use-wine
variables:
@@ -324,7 +324,7 @@ fedora/x86_64_build:
.kernel+rootfs:
extends:
- .build-rules
- .container+build-rules
stage: container
variables:
GIT_STRATEGY: fetch
@@ -374,7 +374,7 @@ kernel+rootfs_arm32:
- .fdo.container-build@debian
- .container
# Don't want the .container rules
- .build-rules
- .container+build-rules
variables:
FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
ARTIFACTS_PREFIX: "https://${S3_HOST}/mesa-lava"
@@ -450,7 +450,7 @@ debian/arm64_test:
- .windows-shell-tags
rules:
- !reference [.microsoft-farm-container-rules, rules]
- !reference [.container-rules, rules]
- !reference [.container+build-rules, rules]
variables:
GIT_STRATEGY: fetch # we do actually need the full repository though
MESA_BASE_IMAGE: None
@@ -475,7 +475,7 @@ windows_build_vs2019:
- .windows_container_build
rules:
- !reference [.microsoft-farm-rules, rules]
- !reference [.build-rules, rules]
- !reference [.container+build-rules, rules]
variables:
MESA_IMAGE_PATH: &windows_build_image_path ${WINDOWS_X64_BUILD_PATH}
MESA_IMAGE_TAG: &windows_build_image_tag ${MESA_BASE_IMAGE_TAG}--${WINDOWS_X64_BUILD_TAG}
@@ -494,7 +494,7 @@ windows_test_vs2019:
- .windows_container_build
rules:
- !reference [.microsoft-farm-rules, rules]
- !reference [.build-rules, rules]
- !reference [.container+build-rules, rules]
variables:
MESA_IMAGE_PATH: &windows_test_image_path ${WINDOWS_X64_TEST_PATH}
MESA_IMAGE_TAG: &windows_test_image_tag ${MESA_BASE_IMAGE_TAG}--${WINDOWS_X64_TEST_TAG}