Skip to content

Commit 36171e5

Browse files
authored
Add necessary changes for renaming the main branch. (#519)
1 parent 57120df commit 36171e5

32 files changed

Lines changed: 358 additions & 358 deletions

.github/actions/common/license-namespace-checker/action.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ runs:
2323
REPO_PATH: ${{ inputs.path }}
2424
run: |
2525
cd "${REPO_PATH}"
26-
if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
27-
git fetch origin master:master
28-
echo "Fetched master branch"
26+
if [ "$(git rev-parse --abbrev-ref HEAD)" != "main" ]; then
27+
git fetch origin main:main
28+
echo "Fetched main branch"
2929
fi
30-
changed_files=$(git diff --name-only master...$GITHUB_SHA -- '*.h' '*.hpp' '*.c' '*.cpp' '*.sh' '*.py' '*.txt' | grep -E '.*\.(h|hpp|c|cpp|sh|py|txt)$' || true)
30+
changed_files=$(git diff --name-only main...$GITHUB_SHA -- '*.h' '*.hpp' '*.c' '*.cpp' '*.sh' '*.py' '*.txt' | grep -E '.*\.(h|hpp|c|cpp|sh|py|txt)$' || true)
3131
echo "Performed git diff"
3232
if [ -n "$changed_files" ]; then
3333
# Add changed files list to the GITHUB_OUTPUT separated by spaces

.github/workflows/dls-coverity.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131
id: detect-langs
3232
run: |
3333
cd dlstreamer-repo
34-
if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
35-
git fetch origin master:master
36-
echo "Fetched master branch"
34+
if [ "$(git rev-parse --abbrev-ref HEAD)" != "main" ]; then
35+
git fetch origin main:main
36+
echo "Fetched main branch"
3737
fi
38-
changed_files=$(git diff --name-only master...$GITHUB_SHA -- '*.h' '*.hpp' '*.c' '*.cpp' || true)
38+
changed_files=$(git diff --name-only main...$GITHUB_SHA -- '*.h' '*.hpp' '*.c' '*.cpp' || true)
3939
echo "Performed git diff"
4040
4141
if [ -z "$changed_files" ]; then

.github/workflows/dls-pr-workflow.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ run-name: "[DLS] PR workflow (by @${{ github.actor }} via ${{ github.event_name
33
on:
44
push:
55
branches:
6-
- 'master'
6+
- 'main'
77
paths:
88
- 'cmake/**'
99
- 'docker/**'
@@ -135,14 +135,14 @@ jobs:
135135
- name: Fetch main branch for comparison
136136
run: |
137137
cd dlstreamer-repo
138-
git fetch origin master
138+
git fetch origin main
139139
140140
- name: Detect changes in docker directory
141141
id: check
142142
run: |
143143
echo "🔍 Checking for changes in 'docker/'..."
144144
cd dlstreamer-repo
145-
CHANGED_FILES=$(git diff --name-only origin/master...HEAD -- 'docker/')
145+
CHANGED_FILES=$(git diff --name-only origin/main...HEAD -- 'docker/')
146146
147147
if [ -n "${CHANGED_FILES}" ]; then
148148
echo "📄 Changed Docker-related files:"

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
schedule:
1313
- cron: '19 4 * * 0'
1414
push:
15-
branches: [ "master" ]
15+
branches: [ "main" ]
1616

1717
# Declare default permissions as read only.
1818
permissions: read-all

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ dist: xenial
22

33
branches:
44
only:
5-
- master
5+
- main
66

77
services:
88
- docker
@@ -18,4 +18,4 @@ deploy:
1818
local_dir: docs/html
1919
github_token: $GH_REPO_TOKEN
2020
on:
21-
branch: master
21+
branch: main

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ set(PLUGIN_VERSION ${PRODUCT_VERSION})
4444
add_definitions(-DPLUGIN_VERSION="${PLUGIN_VERSION}")
4545
add_definitions(-DPACKAGE="dlstreamer")
4646
add_definitions(-DPACKAGE_NAME="Deep Learning Streamer elements")
47-
add_definitions(-DGST_PACKAGE_ORIGIN="https://github.com/open-edge-platform/dlstreamer/tree/master")
47+
add_definitions(-DGST_PACKAGE_ORIGIN="https://github.com/open-edge-platform/dlstreamer/tree/main")
4848
add_definitions(-DPLUGIN_LICENSE="MIT/X11")
4949
add_definitions(-DPRODUCT_FULL_NAME="Deep Learning Streamer")
5050
if(WIN32)

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ Please refer to [Install Guide](./docs/source/get_started/install/install_guide_
2727
3. [Compile from source code](./docs/source/dev_guide/advanced_install/advanced_install_guide_compilation.md)
2828
4. [Build Docker image from source code](./docs/source/dev_guide/advanced_install/advanced_build_docker_image.md)
2929

30-
To see the full list of installed components check the [dockerfile content for Ubuntu24](https://github.com/open-edge-platform/dlstreamer/blob/master/docker/ubuntu/ubuntu24.Dockerfile)
30+
To see the full list of installed components check the [dockerfile content for Ubuntu24](https://github.com/open-edge-platform/dlstreamer/blob/main/docker/ubuntu/ubuntu24.Dockerfile)
3131

3232
## Samples
33-
[Samples](https://github.com/open-edge-platform/dlstreamer/tree/master/samples) available for C/C++ and Python programming, and as gst-launch command lines and scripts.
33+
[Samples](https://github.com/open-edge-platform/dlstreamer/tree/main/samples) available for C/C++ and Python programming, and as gst-launch command lines and scripts.
3434

3535
## NN models
3636
DL Streamer supports NN models in OpenVINO™ IR and ONNX* formats.
3737
List of [supported models](./docs/source/supported_models.md) which include LVM, object detection, object classification, human pose detection, sound classification, semantic segmentation, and other use cases on SSD, MobileNet, YOLO, Tiny YOLO, EfficientDet, ResNet, FasterRCNN and other backbones also pre-trained with [Intel® Geti™ Software](<https://www.intel.com/content/www/us/en/developer/tools/tiber/edge-platform/model-builder.html>)
3838

39-
Or you can start from over 70 pre-trained models in [OpenVINO™ Open Model Zoo](https://docs.openvino.ai/latest/omz_models_group_intel.html) and corresponding model-proc files (pre- and post-processing specification) in [/opt/intel/dlstreamer/samples/model_proc](https://github.com/dlstreamer/dlstreamer/tree/master/samples/model_proc) folder.
39+
Or you can start from over 70 pre-trained models in [OpenVINO™ Open Model Zoo](https://docs.openvino.ai/latest/omz_models_group_intel.html) and corresponding model-proc files (pre- and post-processing specification) in [/opt/intel/dlstreamer/samples/model_proc](https://github.com/dlstreamer/dlstreamer/tree/main/samples/model_proc) folder.
4040
These models include object detection, object classification, human pose detection, sound classification, semantic segmentation, and other use cases on SSD, MobileNet, YOLO, Tiny YOLO, EfficientDet, ResNet, FasterRCNN and other backbones.
4141

4242
## Other Useful Links

docker/fedora41/intel-dlstreamer.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Summary: Deep Learning Streamer
55

66
License: Proprietary
77
Source0: %{name}-%{version}.tar.gz
8-
URL: https://github.com/open-edge-platform/dlstreamer/tree/master
8+
URL: https://github.com/open-edge-platform/dlstreamer/tree/main
99
Packager: DL Streamer Team <[email protected]>
1010
ExclusiveArch: x86_64
1111
AutoReqProv: no

docker/ubuntu/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ Package: intel-dlstreamer
88
Architecture: amd64
99
Replaces: intel-dlstreamer
1010
Multi-Arch: same
11-
Homepage: https://github.com/open-edge-platform/dlstreamer/tree/master
11+
Homepage: https://github.com/open-edge-platform/dlstreamer/tree/main
1212
Description: Intel(R) Deep Learning Streamer
1313
Depends: ${misc:Depends}, ${shlibs:Depends}, libglib2.0-0t64, libjpeg-turbo8, libdrm2, libwayland-bin, libwayland-client0, libx11-6, libpng16-16t64, libva-drm2, libcurl4t64, libde265-0, libxext6, libva-x11-2, libgl1, libglx-mesa0, libva-wayland2, openexr, libgudev-1.0-0, vainfo, libpython3.12t64, python3, python3-gi, python3-gi-cairo, libcairo2, libvpx9, libopus0, libsrtp2-1, libxv1, libtbb12, libpaho-mqtt1.3, ffmpeg, libgirepository-1.0-1, libsoup-3.0-0, openvino-2025.4.0

0 commit comments

Comments
 (0)