mirror of
https://gitlab.com/veilid/veilid.git
synced 2025-10-14 11:30:37 -04:00
Changed CACHE_TAG to use CI_MERGE_REQUEST_TARGET_BRANCH_NAME in merge requests for creating build caches
This commit is contained in:
parent
68c3d29184
commit
aef23f6ac3
1 changed files with 3 additions and 2 deletions
|
@ -55,11 +55,12 @@ build_cache:
|
||||||
- 'echo "CI_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE"'
|
- 'echo "CI_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE"'
|
||||||
- 'echo "CI_COMMIT_BRANCH: $CI_COMMIT_BRANCH"'
|
- 'echo "CI_COMMIT_BRANCH: $CI_COMMIT_BRANCH"'
|
||||||
- 'echo "CI_DEFAULT_BRANCH: $CI_DEFAULT_BRANCH"'
|
- 'echo "CI_DEFAULT_BRANCH: $CI_DEFAULT_BRANCH"'
|
||||||
|
- 'echo "CI_MERGE_REQUEST_TARGET_BRANCH_NAME: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME"'
|
||||||
- apk update && apk add jq && apk add curl
|
- apk update && apk add jq && apk add curl
|
||||||
# Determine cache tag based on branch use branch name as tag, sanitize for Docker tag compatibility
|
# Determine cache tag based on branch use branch name as tag, sanitize for Docker tag compatibility
|
||||||
- |
|
- |
|
||||||
if [[ -z "$CI_COMMIT_BRANCH" ]]; then
|
if [[ -z "$CI_COMMIT_BRANCH" ]]; then
|
||||||
CACHE_TAG="$CI_DEFAULT_BRANCH"
|
CACHE_TAG="$CI_MERGE_REQUEST_TARGET_BRANCH_NAME"
|
||||||
CACHE_NAME="build-cache"
|
CACHE_NAME="build-cache"
|
||||||
else
|
else
|
||||||
CACHE_TAG=$(echo "$CI_COMMIT_BRANCH" | sed 's/[^a-zA-Z0-9._-]/-/g')
|
CACHE_TAG=$(echo "$CI_COMMIT_BRANCH" | sed 's/[^a-zA-Z0-9._-]/-/g')
|
||||||
|
@ -125,7 +126,7 @@ test_build:
|
||||||
# Use branch name as tag, sanitize for Docker tag compatibility
|
# Use branch name as tag, sanitize for Docker tag compatibility
|
||||||
- |
|
- |
|
||||||
if [[ -z "$CI_COMMIT_BRANCH" ]]; then
|
if [[ -z "$CI_COMMIT_BRANCH" ]]; then
|
||||||
CACHE_TAG="$CI_DEFAULT_BRANCH"
|
CACHE_TAG="$CI_MERGE_REQUEST_TARGET_BRANCH_NAME"
|
||||||
CACHE_NAME="build-cache"
|
CACHE_NAME="build-cache"
|
||||||
else
|
else
|
||||||
CACHE_TAG=$(echo "$CI_COMMIT_BRANCH" | sed 's/[^a-zA-Z0-9._-]/-/g')
|
CACHE_TAG=$(echo "$CI_COMMIT_BRANCH" | sed 's/[^a-zA-Z0-9._-]/-/g')
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue