Skip to content

Commit 2fe6d99

Browse files
byteplowbyteplow
committed
Merge branch '2022.11' into 2023.11
2 parents 4f61c46 + ce16031 commit 2fe6d99

File tree

6 files changed

+57
-82
lines changed

6 files changed

+57
-82
lines changed

‎ci/gitlab-ci/abstract_customapp.yml

-37
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ stages:
1313
- merge
1414

1515
variables:
16-
# also needs to be set in build job
17-
IMAGE_TAG: $CI_PROJECT_ID-$CI_PIPELINE_IID-$PHP_VERSION
1816
CI_IS_CUSTOMAPP: "true"
1917
# TESTS
2018
PHP_UNIT_ALL_TESTS_SOURCE_PARALLEL: "false"
@@ -40,38 +38,3 @@ workflow:
4038
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME =~ /(^feat)|(^pu)|(change)/
4139
when: never
4240
- when: always
43-
44-
docker_build_source:
45-
stage: build
46-
trigger:
47-
project: tine20/tine20
48-
branch: $TINE20_BRANCH
49-
strategy: depend
50-
variables:
51-
RUN_NO_TESTS: "true"
52-
AUTO_MERGE: "never"
53-
IMAGE_TAG: $CI_PROJECT_ID-$CI_PIPELINE_IID-$PHP_VERSION
54-
DOCKER_BUILD_SOURCE: "true"
55-
docker_build_source_matrix:
56-
stage: build
57-
parallel:
58-
matrix:
59-
- PHP_VERSION:
60-
- "8.0"
61-
- "8.1"
62-
- "8.2"
63-
script:
64-
- echo job is there for needs
65-
rules:
66-
- if: $NOT_TURE == "true"
67-
when: on_success
68-
- when: never
69-
70-
docker_build_built:
71-
stage: build
72-
script:
73-
- echo job is there for needs
74-
rules:
75-
- if: $NOT_TURE == "true"
76-
when: on_success
77-
- when: never

‎ci/gitlab-ci/build_jobs.yml

+21
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,32 @@ docker_build_source_arm64:
240240
docker_build_built:
241241
extends: .abstract_jobs.docker
242242
stage: build2
243+
needs: []
243244
script:
244245
- !reference [.lib, script]
246+
- docker_build_image base $(docker_image_hash base)
245247
- export BASE_IMAGE="${REGISTRY}/base:$(docker_image_hash base)"
248+
- docker_build_image dependency $(docker_image_hash dependency)
246249
- export DEPENDENCY_IMAGE="${REGISTRY}/dependency:$(docker_image_hash dependency)"
250+
- |
251+
echo "${REUSE_IMAGES}"
252+
if [ "${REUSE_IMAGES}" == true ]; then
253+
docker_build_image test-dependency $(docker_image_hash test-dependency)
254+
docker_registry_use_hash_image_as_commit_image test-dependency test-source $(docker_image_hash test-dependency)
255+
else
256+
cp $DOCKER_GIT_CONFIG ./ci/dockerimage/.gitconfig
257+
${CI_BUILDS_DIR}/${CI_PROJECT_NAMESPACE}/tine20/ci/scripts/reuse_or_build_image.sh source false
258+
${CI_BUILDS_DIR}/${CI_PROJECT_NAMESPACE}/tine20/ci/scripts/reuse_or_build_image.sh test-source false
259+
fi
260+
- !reference [.lib, script]
261+
- docker_build_image base $(docker_image_hash base)
262+
- export BASE_IMAGE="${REGISTRY}/base:$(docker_image_hash base)";
263+
- docker_build_image dependency $(docker_image_hash dependency)
264+
- export DEPENDENCY_IMAGE="${REGISTRY}/dependency:$(docker_image_hash dependency)";
247265
- docker_build_image jsdependency $(docker_image_hash jsdependency)
248266
- export JSDEPENDENCY_IMAGE="${REGISTRY}/jsdependency:$(docker_image_hash jsdependency)"
267+
- cp $DOCKER_GIT_CONFIG ./ci/dockerimage/.gitconfig
268+
- ${CI_BUILDS_DIR}/${CI_PROJECT_NAMESPACE}/tine20/ci/scripts/reuse_or_build_image.sh source false
249269
- ${CI_BUILDS_DIR}/${CI_PROJECT_NAMESPACE}/tine20/ci/scripts/build_image.sh jsbuild
250270
- ${CI_BUILDS_DIR}/${CI_PROJECT_NAMESPACE}/tine20/ci/scripts/build_image.sh build
251271
- ${CI_BUILDS_DIR}/${CI_PROJECT_NAMESPACE}/tine20/ci/scripts/build_image.sh built
@@ -316,6 +336,7 @@ docker_build_dev:
316336
stage: build2
317337
script:
318338
- !reference [.lib, script]
339+
- docker_build_image base $(docker_image_hash base)
319340
- export BASE_IMAGE="${REGISTRY}/base:$(docker_image_hash base)";
320341
- ${CI_BUILDS_DIR}/${CI_PROJECT_NAMESPACE}/tine20/ci/scripts/build_image.sh dev
321342
rules:

‎ci/gitlab-ci/lib.yml

-2
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,6 @@
481481
curl -X POST -F token=$MERGE_TRIGGER_TOKEN \
482482
-F ref=$ref \
483483
-F "variables[$var]=true" \
484-
-F "variables[DOCKER_BUILD_SOURCE]=true" \
485484
-F "variables[SEND_PIPELINE_STATUS]=true" \
486485
"$CI_API_V4_URL/projects/$CI_PROJECT_ID/trigger/pipeline" > /dev/null
487486
done
@@ -1490,7 +1489,6 @@
14901489
curl -X POST -F token=$MERGE_TRIGGER_TOKEN \
14911490
-F ref=$ref \
14921491
-F "variables[$var]=true" \
1493-
-F "variables[DOCKER_BUILD_SOURCE]=true" \
14941492
-F "variables[SEND_PIPELINE_STATUS]=true" \
14951493
"$CI_API_V4_URL/projects/$CI_PROJECT_ID/trigger/pipeline" > /dev/null
14961494
done

‎ci/gitlab-ci/lib/scripts/merge.sh

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ merge_trigger_next () {
5555
curl -X POST -F token=$MERGE_TRIGGER_TOKEN \
5656
-F ref=$ref \
5757
-F "variables[$var]=true" \
58-
-F "variables[DOCKER_BUILD_SOURCE]=true" \
5958
-F "variables[SEND_PIPELINE_STATUS]=true" \
6059
"$CI_API_V4_URL/projects/$CI_PROJECT_ID/trigger/pipeline" > /dev/null
6160
done

‎ci/gitlab-ci/test_jobs.yml

+36-35
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,39 @@
1-
check-php-version:
2-
extends: .abstract_jobs.copy_source
3-
stage: test
4-
variables:
5-
ARG_IMAGE: test-source
6-
needs:
7-
- docker_build_source
8-
script:
9-
- echo "PHP version shoud be ${PHP_VERSION}."
10-
- php -r "echo 'PHP version is'.PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION;"
11-
- php -r "if (version_compare(PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION, '${PHP_VERSION}', '!=')) exit(1);"
12-
rules:
13-
- if: $RUN_NO_TESTS == "true"
14-
when: never
15-
- if: $CHECK_PHP_VERSION == "never"
16-
when: never
17-
- if: $RUN_ALL_TESTS == "true"
18-
when: on_success
19-
- if: $CHECK_PHP_VERSION == "true"
20-
when: on_success
21-
- when: never
22-
rules:
23-
- if: $RUN_NO_TESTS == "true"
24-
when: never
25-
- if: $CHECK_PHP_VERSION == "false"
26-
when: never
27-
- if: $CHECK_PHP_VERSION == "true"
28-
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CHECK_PHP_VERSION_MERGE_REQUEST == "true"
29-
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_LABELS =~ /test-with-health-check/
30-
- if: $PIPELINE_TYPE =~ /default-tests/
31-
- if: $PIPELINE_TYPE =~ /mr-tests/
32-
- if: $CI_COMMIT_TAG
33-
allow_failure: true
34-
timeout: 20m # time run: 4m
35-
interruptible: true
1+
# todo: should run ob build image and on test images after they are build
2+
# check-php-version:
3+
# extends: .abstract_jobs.copy_source
4+
# stage: test
5+
# variables:
6+
# ARG_IMAGE: test-source
7+
# needs:
8+
# - docker_build_source
9+
# script:
10+
# - echo "PHP version shoud be ${PHP_VERSION}."
11+
# - php -r "echo 'PHP version is'.PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION;"
12+
# - php -r "if (version_compare(PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION, '${PHP_VERSION}', '!=')) exit(1);"
13+
# rules:
14+
# - if: $RUN_NO_TESTS == "true"
15+
# when: never
16+
# - if: $CHECK_PHP_VERSION == "never"
17+
# when: never
18+
# - if: $RUN_ALL_TESTS == "true"
19+
# when: on_success
20+
# - if: $CHECK_PHP_VERSION == "true"
21+
# when: on_success
22+
# - when: never
23+
# rules:
24+
# - if: $RUN_NO_TESTS == "true"
25+
# when: never
26+
# - if: $CHECK_PHP_VERSION == "false"
27+
# when: never
28+
# - if: $CHECK_PHP_VERSION == "true"
29+
# - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CHECK_PHP_VERSION_MERGE_REQUEST == "true"
30+
# - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_LABELS =~ /test-with-health-check/
31+
# - if: $PIPELINE_TYPE =~ /default-tests/
32+
# - if: $PIPELINE_TYPE =~ /mr-tests/
33+
# - if: $CI_COMMIT_TAG
34+
# allow_failure: true
35+
# timeout: 20m # time run: 4m
36+
# interruptible: true
3637

3738
phpstan-analysis:
3839
stage: test

‎ci/gitlab-ci/test_php_jobs.yml

-7
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ php-unit-all-tests-source-matrix:
4747
variables:
4848
NODE_TOTAL: 1
4949
NODE_INDEX: 1
50-
IMAGE_TAG: ${CI_PIPELINE_ID}-${PHP_VERSION}
51-
needs:
52-
- docker_build_source
53-
- 'docker_build_source_matrix: [8.0]'
54-
- 'docker_build_source_matrix: [8.1]'
55-
- 'docker_build_source_matrix: [8.2]'
5650
parallel:
5751
matrix:
5852
- DATABASE_IMAGE:
@@ -297,7 +291,6 @@ php-unit-nogitlabci-tests-built-parallel:
297291
when: never
298292
- !reference [.php-unit-nogitlabci-tests-built, rules]
299293

300-
301294
php-unit-update-tests:
302295
extends: .abstract_jobs.php_unit
303296
variables:

0 commit comments

Comments
 (0)