Skip to content

Commit b06df55

Browse files
KarolinaPomianKarolinaPomian
committed
prettier fix
1 parent 8f02168 commit b06df55

File tree

2 files changed

+114
-111
lines changed

2 files changed

+114
-111
lines changed

‎.github/workflows/base_build.yml‎

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ name: Base Build
22

33
on:
44
push:
5-
branches: [ "main" ]
5+
branches: ["main"]
66
pull_request:
7-
branches: [ "main" ]
7+
branches: ["main"]
88
workflow_dispatch:
99
workflow_call:
1010
inputs:
1111
branch:
1212
required: false
1313
type: string
14-
default: 'main'
15-
description: 'Branch to checkout'
14+
default: "main"
15+
description: "Branch to checkout"
1616

1717
env:
1818
BUILD_TYPE: Release
@@ -34,82 +34,82 @@ concurrency:
3434

3535
jobs:
3636
build-baremetal-ubuntu:
37-
runs-on: 'ubuntu-22.04'
37+
runs-on: "ubuntu-22.04"
3838
timeout-minutes: 120
3939
steps:
40-
- name: 'Harden Runner'
41-
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
42-
with:
43-
egress-policy: audit
44-
45-
- name: 'Checkout repository'
46-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
47-
with:
48-
ref: ${{ inputs.branch }}
49-
50-
- name: 'Install OS level dependencies'
51-
run: eval 'source scripts/setup_build_env.sh && install_package_dependencies'
52-
53-
- name: 'Check local dependencies build cache'
54-
id: load-local-dependencies-cache
55-
uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
56-
with:
57-
path: ${{ env.BUILD_DIR }}
58-
key: ${{ runner.os }}-${{ hashFiles('versions.env') }}-${{ hashFiles('scripts/setup*.sh') }}
59-
60-
- name: 'Download, unpack and patch build dependencies'
61-
if: steps.load-local-dependencies-cache.outputs.cache-hit != 'true'
62-
run: eval 'source scripts/setup_build_env.sh && get_download_unpack_dependencies'
63-
64-
- name: 'Clone and patch ffmpeg 6.1 and 7.0'
65-
if: steps.load-local-dependencies-cache.outputs.cache-hit != 'true'
66-
run: |
67-
ffmpeg-plugin/clone-and-patch-ffmpeg.sh "6.1"
68-
ffmpeg-plugin/clone-and-patch-ffmpeg.sh "7.0"
69-
70-
- name: 'Build and Install xdp and libbpf'
71-
run: eval 'source scripts/setup_build_env.sh && lib_install_xdp_bpf_tools'
72-
73-
- name: 'Build and Install libfabric'
74-
run: eval 'source scripts/setup_build_env.sh && lib_install_fabrics'
75-
76-
- name: 'Build and Install the DPDK'
77-
run: eval 'source scripts/setup_build_env.sh && lib_install_dpdk'
78-
79-
- name: 'Build and Install the MTL'
80-
run: eval 'source scripts/setup_build_env.sh && lib_install_mtl'
81-
82-
- name: 'Build and Install JPEG XS'
83-
run: eval 'source scripts/setup_build_env.sh && lib_install_jpeg_xs'
84-
85-
- name: 'Build and Install JPEG XS ffmpeg plugin'
86-
run: eval 'source scripts/setup_build_env.sh && lib_install_mtl_jpeg_xs_plugin'
87-
88-
- name: 'Build gRPC and dependencies'
89-
run: eval 'source scripts/setup_build_env.sh && lib_install_grpc'
90-
91-
- name: 'Build MCM SDK and Media Proxy'
92-
run: eval 'source scripts/common.sh && ./build.sh "${PREFIX_DIR}"'
93-
94-
- name: 'Build FFmpeg 6.1 with MCM plugin'
95-
working-directory: ${{ github.workspace }}/ffmpeg-plugin
96-
run: |
97-
./configure-ffmpeg.sh "6.1" --disable-doc --disable-debug && \
98-
./build-ffmpeg.sh "6.1"
99-
100-
- name: 'Build FFmpeg 7.0 with MCM plugin'
101-
working-directory: ${{ github.workspace }}/ffmpeg-plugin
102-
run: |
103-
./configure-ffmpeg.sh "7.0" --disable-doc --disable-debug && \
104-
./build-ffmpeg.sh "7.0"
105-
106-
- name: 'upload media-proxy and mcm binaries'
107-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
108-
with:
109-
name: mcm-build
110-
path: |
111-
${{ env.BUILD_DIR }}/mcm/bin/media_proxy
112-
${{ env.BUILD_DIR }}/mcm/bin/mesh-agent
113-
${{ env.BUILD_DIR }}/mcm/lib/libmcm_dp.so.*
114-
${{ env.BUILD_DIR }}/ffmpeg-6-1/ffmpeg
115-
${{ env.BUILD_DIR }}/ffmpeg-7-0/ffmpeg
40+
- name: "Harden Runner"
41+
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
42+
with:
43+
egress-policy: audit
44+
45+
- name: "Checkout repository"
46+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
47+
with:
48+
ref: ${{ inputs.branch }}
49+
50+
- name: "Install OS level dependencies"
51+
run: eval 'source scripts/setup_build_env.sh && install_package_dependencies'
52+
53+
- name: "Check local dependencies build cache"
54+
id: load-local-dependencies-cache
55+
uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
56+
with:
57+
path: ${{ env.BUILD_DIR }}
58+
key: ${{ runner.os }}-${{ hashFiles('versions.env') }}-${{ hashFiles('scripts/setup*.sh') }}
59+
60+
- name: "Download, unpack and patch build dependencies"
61+
if: steps.load-local-dependencies-cache.outputs.cache-hit != 'true'
62+
run: eval 'source scripts/setup_build_env.sh && get_download_unpack_dependencies'
63+
64+
- name: "Clone and patch ffmpeg 6.1 and 7.0"
65+
if: steps.load-local-dependencies-cache.outputs.cache-hit != 'true'
66+
run: |
67+
ffmpeg-plugin/clone-and-patch-ffmpeg.sh "6.1"
68+
ffmpeg-plugin/clone-and-patch-ffmpeg.sh "7.0"
69+
70+
- name: "Build and Install xdp and libbpf"
71+
run: eval 'source scripts/setup_build_env.sh && lib_install_xdp_bpf_tools'
72+
73+
- name: "Build and Install libfabric"
74+
run: eval 'source scripts/setup_build_env.sh && lib_install_fabrics'
75+
76+
- name: "Build and Install the DPDK"
77+
run: eval 'source scripts/setup_build_env.sh && lib_install_dpdk'
78+
79+
- name: "Build and Install the MTL"
80+
run: eval 'source scripts/setup_build_env.sh && lib_install_mtl'
81+
82+
- name: "Build and Install JPEG XS"
83+
run: eval 'source scripts/setup_build_env.sh && lib_install_jpeg_xs'
84+
85+
- name: "Build and Install JPEG XS ffmpeg plugin"
86+
run: eval 'source scripts/setup_build_env.sh && lib_install_mtl_jpeg_xs_plugin'
87+
88+
- name: "Build gRPC and dependencies"
89+
run: eval 'source scripts/setup_build_env.sh && lib_install_grpc'
90+
91+
- name: "Build MCM SDK and Media Proxy"
92+
run: eval 'source scripts/common.sh && ./build.sh "${PREFIX_DIR}"'
93+
94+
- name: "Build FFmpeg 6.1 with MCM plugin"
95+
working-directory: ${{ github.workspace }}/ffmpeg-plugin
96+
run: |
97+
./configure-ffmpeg.sh "6.1" --disable-doc --disable-debug && \
98+
./build-ffmpeg.sh "6.1"
99+
100+
- name: "Build FFmpeg 7.0 with MCM plugin"
101+
working-directory: ${{ github.workspace }}/ffmpeg-plugin
102+
run: |
103+
./configure-ffmpeg.sh "7.0" --disable-doc --disable-debug && \
104+
./build-ffmpeg.sh "7.0"
105+
106+
- name: "upload media-proxy and mcm binaries"
107+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
108+
with:
109+
name: mcm-build
110+
path: |
111+
${{ env.BUILD_DIR }}/mcm/bin/media_proxy
112+
${{ env.BUILD_DIR }}/mcm/bin/mesh-agent
113+
${{ env.BUILD_DIR }}/mcm/lib/libmcm_dp.so.*
114+
${{ env.BUILD_DIR }}/ffmpeg-6-1/ffmpeg
115+
${{ env.BUILD_DIR }}/ffmpeg-7-0/ffmpeg

‎.github/workflows/smoke_tests.yml‎

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,35 @@ on:
44
push:
55
branches: ["main", "smoke-tests"]
66
pull_request:
7-
branches: [ "main" ]
7+
branches: ["main"]
88
workflow_dispatch:
99
inputs:
1010
branch-to-checkout:
1111
type: string
12-
default: 'main'
12+
default: "main"
1313
required: false
14-
description: 'Branch name to use'
14+
description: "Branch name to use"
1515
list_tests:
1616
type: choice
1717
required: false
18-
description: 'List all tests before running'
18+
description: "List all tests before running"
1919
options:
2020
- "true"
2121
- "false"
2222
markers:
2323
type: string
24-
default: 'smoke'
24+
default: "smoke"
2525
required: false
26-
description: 'Markers to use for pytest'
26+
description: "Markers to use for pytest"
2727
env:
28-
BUILD_TYPE: 'Release'
29-
DPDK_VERSION: '23.11'
30-
DPDK_REBUILD: 'false'
31-
MEDIA_PATH: '/mnt/media'
28+
BUILD_TYPE: "Release"
29+
DPDK_VERSION: "23.11"
30+
DPDK_REBUILD: "false"
31+
MEDIA_PATH: "/mnt/media"
3232
BUILD_DIR: "${{ github.workspace }}/_build"
33-
MCM_BINARIES_DIR: './mcm-binaries'
34-
MEDIA_PROXY: './mcm-binaries/media_proxy'
35-
MESH_AGENT: './mcm-binaries/mesh-agent'
33+
MCM_BINARIES_DIR: "./mcm-binaries"
34+
MEDIA_PROXY: "./mcm-binaries/media_proxy"
35+
MESH_AGENT: "./mcm-binaries/mesh-agent"
3636
MCM_FFMPEG_7_0: ./mcm-binaries/ffmpeg-7-0/ffmpeg
3737
MTL_FFMPEG_7_0: ./mtl-binaries/ffmpeg-7-0/ffmpeg
3838
MCM_FFMPEG_6_1: ./mcm-binaries/ffmpeg-6-1/ffmpeg
@@ -41,62 +41,65 @@ env:
4141
permissions:
4242
contents: read
4343

44-
concurrency:
45-
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
46-
cancel-in-progress: true
47-
4844
jobs:
4945
call-base-build:
5046
uses: ./.github/workflows/base_build.yml
5147
with:
5248
branch: ${{ github.event_name == 'push' && github.ref_name || github.event.inputs.branch-to-checkout || 'main' }}
49+
concurrency:
50+
group: build-${{ github.head_ref || github.run_id }}
51+
cancel-in-progress: true
52+
5353
validation-prepare-setup-mcm:
5454
runs-on: [Linux, self-hosted]
5555
needs: call-base-build
5656
timeout-minutes: 60
5757
outputs:
5858
pipenv-activate: ${{ steps.pipenv-install.outputs.VIRTUAL_ENV }}
59+
concurrency:
60+
group: setup-${{ github.head_ref || github.run_id }}
61+
cancel-in-progress: true
5962
steps:
60-
- name: 'preparation: Harden Runner'
63+
- name: "preparation: Harden Runner"
6164
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
6265
with:
6366
egress-policy: audit
64-
- name: 'preparation: Restore valid repository owner and print env'
67+
- name: "preparation: Restore valid repository owner and print env"
6568
if: always()
6669
run: |
6770
sudo chown -R "${USER}" "$(pwd)" || true
6871
env | grep BUILD_ || true
6972
env | grep DPDK_ || true
70-
- name: 'preparation: Checkout MCM'
73+
- name: "preparation: Checkout MCM"
7174
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7275
with:
7376
ref: ${{ github.event_name == 'push' && github.ref_name || github.event.inputs.branch-to-checkout || 'main' }}
7477
- name: Install RxTxApp dependencies
7578
run: sudo apt-get update && sudo apt-get install -y libjansson-dev
76-
- name: 'build RxTxApp'
79+
- name: "build RxTxApp"
7780
working-directory: ${{ github.workspace }}/tests/tools/TestApp
7881
run: |
7982
mkdir build && cd build && \
8083
cmake .. && \
8184
make
82-
- name: 'clone FFMPEG repository'
85+
- name: "clone FFMPEG repository"
8386
run: |
8487
echo "Cloning FFMPEG repository"
85-
- name: 'clone MTL repository'
88+
- name: "clone MTL repository"
8689
run: |
8790
echo "Cloning MTL repository"
88-
- name: 'build MTL FFMPEG'
91+
- name: "build MTL FFMPEG"
8992
run: |
9093
echo "Building MTL FFMPEG"
91-
- name: 'installation: Install pipenv environment'
94+
- name: "installation: Install pipenv environment"
9295
working-directory: tests/validation
9396
id: pipenv-install
9497
run: |
9598
python3 -m venv venv
9699
source venv/bin/activate
97100
pip install -r requirements.txt
98101
echo "VIRTUAL_ENV=$PWD/venv/bin/activate" >> "$GITHUB_ENV"
99-
- name: 'add user name to environment and config'
102+
- name: "add user name to environment and config"
100103
run: |
101104
echo "USER=${USER}" >> "$GITHUB_ENV"
102105
sed -i "s/{{ USER }}/${USER}/g" tests/validation/configs/topology_config_workflow.yaml
@@ -107,21 +110,21 @@ jobs:
107110
runs-on: [Linux, self-hosted]
108111
timeout-minutes: 60
109112
env:
110-
PYTEST_RETRIES: '3'
113+
PYTEST_RETRIES: "3"
111114
MARKERS: ${{ github.event.inputs.markers || 'smoke' }}
112115
LIST_TESTS: ${{ github.event.inputs.list_tests || 'true' }}
113116
steps:
114-
- name: 'preparation: Kill pytest routines'
117+
- name: "preparation: Kill pytest routines"
115118
run: |
116119
sudo killall -SIGINT pipenv || true
117120
sudo killall -SIGINT pytest || true
118-
- name: 'list all tests marked with ${{ env.MARKERS }}'
121+
- name: "list all tests marked with ${{ env.MARKERS }}"
119122
if: ${{ env.LIST_TESTS == 'true' }}
120123
run: |
121124
sudo tests/validation/venv/bin/python3 -m pytest \
122125
--collect-only --quiet ./tests/validation/functional/ \
123126
-m "${{ env.MARKERS }}"
124-
- name: 'execution: Run validation-bare-metal tests in virtual environment'
127+
- name: "execution: Run validation-bare-metal tests in virtual environment"
125128
run: |
126129
sudo tests/validation/venv/bin/python3 -m pytest \
127130
--topology_config=tests/validation/configs/topology_config_workflow.yaml \

0 commit comments

Comments
 (0)