Skip to content

Commit b1be0b6

Browse files
committed
rules for merge_request running
1 parent 5aef7ca commit b1be0b6

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

.gitlab-ci.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ cache:
1515
build-job:
1616
stage: build
1717
rules:
18+
- if: '$CI_COMMIT_BRANCH == "main"'
19+
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
1820
- changes:
1921
- (exclude)README.md
2022
- (exclude)scripts/**/*
@@ -24,9 +26,10 @@ build-job:
2426
- export CCACHE_BASEDIR="$PWD"
2527
- export CCACHE_DIR="$PWD/ccache"
2628
- export CCACHE_COMPILERCHECK=content
27-
- if [ -f "$CI_PROJECT_DIR/ccache.tar.gz" ]; then tar -xzf "$CI_PROJECT_DIR/ccache.tar.gz" -C $CCACHE_DIR; fi
29+
- if [ -d "$CCACHE_DIR" ] && [ "$(ls -A $CCACHE_DIR)" ]; then echo "Using existing ccache"; else echo "No active ccache found"; fi
30+
# - if [ -f "$CI_PROJECT_DIR/ccache.tar.gz" ]; then tar -xzf "$CI_PROJECT_DIR/ccache.tar.gz" -C $CCACHE_DIR; fi
2831
- mkdir -p $CCACHE_DIR
29-
- ccache --zero-stats || true
32+
# - ccache --zero-stats || true
3033
- ccache --show-stats || true
3134
- git clean -ffdx
3235

@@ -43,17 +46,21 @@ build-job:
4346
after_script:
4447
- export CCACHE_DIR="$PWD/ccache"
4548
- ccache --show-stats || true
46-
- tar -czf ${CCACHE_DIR}/ccache.tar.gz $CCACHE_DIR
47-
- mv ${CCACHE_DIR}/ccache.tar.gz $CI_PROJECT_DIR/
49+
# - tar -czf ${CCACHE_DIR}/ccache.tar.gz $CCACHE_DIR
50+
# - mv ${CCACHE_DIR}/ccache.tar.gz $CI_PROJECT_DIR/
4851

4952
artifacts:
5053
paths:
5154
- build
52-
- ${CCACHE_DIR}/ccache.tar.gz
55+
- install
56+
- ${CCACHE_DIR}
57+
# - ${CCACHE_DIR}/ccache.tar.gz
5358

5459
test-job:
5560
stage: test
5661
rules:
62+
- if: '$CI_COMMIT_BRANCH == "main"'
63+
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
5764
- changes:
5865
- (exclude)README.md
5966
- (exclude)scripts/**/*
@@ -66,7 +73,7 @@ test-job:
6673
before_script:
6774
- export CCACHE_DIR="$PWD/ccache"
6875
- mkdir -p $CCACHE_DIR
69-
- tar -xzf ${CCACHE_DIR}/ccache.tar.gz -C $CCACHE_DIR || true
76+
# - tar -xzf ${CCACHE_DIR}/ccache.tar.gz -C $CCACHE_DIR || true
7077

7178
script:
7279
- echo $PWD
@@ -81,4 +88,8 @@ test-job:
8188
reports:
8289
junit:
8390
- ${base_path}/apps/src/tests/report.xml
84-
- ${base_path}/apps/src/tests/pytest_report.xml
91+
- ${base_path}/apps/src/tests/pytest_report.xml
92+
paths:
93+
- ${CCACHE_DIR}
94+
- ${base_path}/apps/src/tests/report.xml
95+
- ${base_path}/apps/src/tests/pytest_report.xml

0 commit comments

Comments
 (0)