Skip to content

Commit 1fab3df

Browse files
committed
Merge branch 'next' into agpl_next
2 parents e88171f + b8d194e commit 1fab3df

File tree

3 files changed

+22
-14
lines changed

3 files changed

+22
-14
lines changed

.github/workflows/ccpp.yml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,36 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
os: [ubuntu-22.04, ubuntu-20.04]
10+
os: [ubuntu-24.04, ubuntu-22.04]
1111
compiler: [gcc, clang]
1212
steps:
1313
- uses: actions/checkout@v3
1414
- name: Build srsRAN on x86 ${{ matrix.os }}
1515
run: |
1616
sudo apt update
17-
sudo apt install -y build-essential cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libconfig++-dev libsctp-dev colordiff ninja-build valgrind
18-
mkdir build && cd build && cmake -DRF_FOUND=True -GNinja .. && ninja && ctest
17+
sudo apt install -y --no-install-recommends build-essential cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libboost-system-dev libconfig++-dev libsctp-dev ninja-build
18+
mkdir build && cd build &&
19+
if [ "${{ matrix.os }}" = "ubuntu-24.04" ]; then
20+
cmake -DENABLE_WERROR=False -DRF_FOUND=True -GNinja ..
21+
else
22+
cmake -DRF_FOUND=True -GNinja ..
23+
fi
24+
export CTEST_PARALLEL_LEVEL=$(nproc --all)
25+
ninja && ninja test
1926
2027
aarch64_ubuntu_build:
2128
name: Build on aarch64
2229
runs-on: ${{ matrix.os }}
2330
strategy:
2431
fail-fast: false
2532
matrix:
26-
os: [ubuntu-20.04]
33+
os: [ubuntu-24.04, ubuntu-22.04]
2734
compiler: [gcc, clang]
2835
include:
29-
- os: ubuntu-20.04
30-
distro: ubuntu20.04
36+
- os: ubuntu-24.04
37+
distro: ubuntu24.04
38+
- os: ubuntu-22.04
39+
distro: ubuntu22.04
3140
steps:
3241
- uses: actions/checkout@v3
3342
- name: Build srsRAN on aarch64 ${{ matrix.os }}
@@ -38,5 +47,5 @@ jobs:
3847
run: |
3948
export CTEST_PARALLEL_LEVEL=$(nproc --all)
4049
apt update
41-
apt install -y build-essential cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libconfig++-dev libsctp-dev ninja-build
42-
ls -l && pwd && mkdir build && cd build && cmake -DRF_FOUND=True -GNinja .. && ninja
50+
apt install -y build-essential --no-install-recommends cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libboost-system-dev libconfig++-dev libsctp-dev ninja-build
51+
mkdir build && cd build && cmake -DRF_FOUND=True -GNinja .. && ninja

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ jobs:
4444
4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@v2
47+
uses: github/codeql-action/init@v3
4848
with:
4949
languages: ${{ matrix.language }}
5050

5151
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5252
# If this step fails, then you should remove it and run the build manually (see below)
5353
- name: Autobuild
54-
uses: github/codeql-action/autobuild@v2
54+
uses: github/codeql-action/autobuild@v3
5555

5656
# ℹ️ Command-line programs to run using the OS shell.
5757
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -64,6 +64,6 @@ jobs:
6464
# ./location_of_script_within_repo/buildscript.sh
6565

6666
- name: Perform CodeQL Analysis
67-
uses: github/codeql-action/analyze@v2
67+
uses: github/codeql-action/analyze@v3
6868
with:
6969
category: "/language:${{matrix.language}}"

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
srsRAN
22
======
33

4-
[![Build Status](https://github.com/srsran/srsRAN_4G/actions/workflows/ccpp.yml/badge.svg?branch=master)](https://github.com/srsran/srsRAN_4G/actions/workflows/ccpp.yml)
5-
[![CodeQL](https://github.com/srsran/srsRAN_4G/actions/workflows/codeql.yml/badge.svg?branch=master)](https://github.com/srsran/srsRAN_4G/actions/workflows/codeql.yml)
6-
[![Coverity](https://scan.coverity.com/projects/28268/badge.svg)](https://scan.coverity.com/projects/srsran_4g_agpl)
4+
[![Build Status](https://github.com/srsran/srsRAN_4G/actions/workflows/ccpp.yml/badge.svg)](https://github.com/srsran/srsRAN_4G/actions/workflows/ccpp.yml)
5+
[![CodeQL](https://github.com/srsran/srsRAN_4G/actions/workflows/codeql.yml/badge.svg)](https://github.com/srsran/srsRAN_4G/actions/workflows/codeql.yml)
76

87
srsRAN is an open source 4G software radio suite developed by [SRS](http://www.srs.io). For 5G RAN, see our new O-RAN CU/DU solution - [srsRAN Project](https://www.github.com/srsran/srsran_project).
98

0 commit comments

Comments
 (0)