Skip to content

Commit bcb449d

Browse files
author
codebot
committed
Update main
# Conflicts: # apps/gnb/adapters/CMakeLists.txt # include/srsran/ofh/ofh_symbol_handler.h # include/srsran/ran/precoding/precoding_configuration.h # lib/ofh/receiver/ofh_ota_rx_symbol_handler.cpp # lib/ofh/receiver/ofh_ota_rx_symbol_handler.h # tests/unittests/phy/upper/channel_processors/pdcch_modulator_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pdcch_processor_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pdsch_modulator_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pdsch_processor_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/dmrs_pdcch_processor_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/dmrs_pdsch_processor_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/nzp_csi_rs_generator_test_data.tar.gz
2 parents 0112729 + c020f0a commit bcb449d

File tree

449 files changed

+28863
-5867
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

449 files changed

+28863
-5867
lines changed

.gitlab-ci.yml

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ include:
3939
- project: softwareradiosystems/ci/tools
4040
ref: "8"
4141
file: .gitlab/ci-shared/tools/tagger.yml
42+
- local: .gitlab/ci/builders/version.yml
4243
- local: .gitlab/ci/build.yml
4344
- local: .gitlab/ci/trx.yml
4445
- local: .gitlab/ci/e2e.yml
@@ -68,6 +69,19 @@ autorebaser full:
6869
- if: $ON_DEFAULT_BRANCH
6970
when: never
7071

72+
trigger builder:
73+
stage: ci
74+
rules:
75+
- if: $ON_MR
76+
changes:
77+
paths:
78+
- .gitlab/ci/src_cache.yml
79+
- .gitlab/ci/builders.yml
80+
- .gitlab/ci/builders/**/*
81+
trigger:
82+
include: .gitlab/ci/builders.yml
83+
strategy: depend
84+
7185
################################################################################
7286
## Static
7387
################################################################################
@@ -89,9 +103,15 @@ full-code-format:
89103
- if: $CI_DESCRIPTION =~ /Nightly/
90104

91105
.codechecker:
92-
image: ${CR_REGISTRY_URI}/${CI_TOOLS_REPO}/codechecker-gnb:1.0.3
106+
image: ${CR_REGISTRY_URI}/srsgnb/codechecker:${DOCKER_BUILDER_VERSION}
93107
stage: static
94-
needs: []
108+
needs:
109+
- job: builder version
110+
optional: false
111+
artifacts: true
112+
- job: trigger builder
113+
optional: true
114+
artifacts: false
95115
variables:
96116
ANALYZER: ""
97117
ANALYZER_ARGS: ""
@@ -225,8 +245,6 @@ unit coverage:
225245
image:
226246
name: ${CR_REGISTRY_URI}/${CI_TOOLS_REPO}/report-generator:5.1.10
227247
entrypoint: ["/bin/sh", "-c"]
228-
variables:
229-
GIT_STRATEGY: none
230248
rules:
231249
- if: $ON_MR
232250
variables:
@@ -281,7 +299,6 @@ unit coverage:
281299
- apk update; apk add python3 py3-pip
282300
- pip3 install --verbose retina-reporter --index-url https://__token__:[email protected]/api/v4/projects/44296988/packages/pypi/simple
283301
- retina-reporter --input build_time_metrics.json --bucket ci --db-config token=$INFLUXDB_TOKEN org=$INFLUXDB_ORG url=$INFLUXDB_URL
284-
285302
coverage: /^\s*Line coverage:\s*\d+.\d+\%/
286303
artifacts:
287304
paths:
@@ -303,19 +320,23 @@ pages:
303320
rules:
304321
- if: $CI_DESCRIPTION == "Nightly"
305322
when: always # Even if previous stages/required jobs fail
306-
image: ${CR_REGISTRY_URI}/${CI_TOOLS_REPO}/doxygen:1.5.0
323+
image: ${CR_REGISTRY_URI}/${CI_TOOLS_REPO}/doxygen:2.0.0
307324
script:
308-
- ls
309-
- ls zmq
310-
- cat ./zmq/job.env
311325
- mkdir public
312326
- mv coverage_html public/
313327
- mv codechecker*html public/
314328
- mv docs/index.html public/index.html
315-
- doxygen_generator.sh
329+
- .gitlab/ci/builders/install_dependencies.sh
330+
- |
331+
rm -Rf build
332+
mkdir build
333+
cd build || exit
334+
cmake -G Ninja ..
335+
ninja doxygen
336+
mv ./docs/html ./public
337+
cd ..
316338
- mv build/public/index.html build/public/index_doxygen.html
317339
- find build/public/ -name '*.*' -exec mv {} public/ \;
318-
319340
after_script:
320341
- |
321342
if [ $CI_JOB_STATUS = "failed" ]; then
@@ -395,8 +416,10 @@ tag successful schedule:
395416
rules:
396417
- if: $CI_DESCRIPTION =~ /Nightly/
397418
when: manual
419+
allow_failure: true
398420
- if: $CI_DESCRIPTION =~ /Weekly/
399421
when: manual
422+
allow_failure: true
400423
variables:
401424
GIT_STRATEGY: none
402425
interruptible: false

0 commit comments

Comments
 (0)