Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Used newer version of checkout github action #14843

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .ci/azure/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ trigger:
- master
- releases/*
paths:
exclude:
exclude:
- docs/
- /**/docs/*
- /**/*.md
Expand All @@ -17,7 +17,7 @@ pr:
- master
- releases/*
paths:
exclude:
exclude:
- docs/
- /**/docs/*
- /**/*.md
Expand Down Expand Up @@ -89,25 +89,25 @@ jobs:
rd /Q /S $(BUILD_SAMPLES_DIR) & mkdir $(BUILD_SAMPLES_DIR)
rd /Q /S $(BUILD_SAMPLES_TESTS_DIR) & mkdir $(BUILD_SAMPLES_TESTS_DIR)
displayName: 'Make dir'

- script: curl -O https://www.python.org/ftp/python/3.10.7/python-3.10.7-amd64.exe
displayName: 'Download Python'
workingDirectory: $(WORK_DIR)
continueOnError: false

- script: |
python-3.10.7-amd64.exe /passive InstallAllUsers=0 Include_launcher=0 TargetDir=C:\hostedtoolcache\windows\Python\3.10.7\x64
cp C:\hostedtoolcache\windows\Python\3.8.2\x64.complete C:\hostedtoolcache\windows\Python\3.10.7\x64.complete
displayName: 'Install Python'
workingDirectory: $(WORK_DIR)
continueOnError: false

- task: UsePythonVersion@0
displayName: 'Use Python'
inputs:
versionSpec: '3.10.7'
versionSpec: '3.10'
disableDownloadFromRegistry: true

- script: |
powershell -command "Invoke-RestMethod -Headers @{\"Metadata\"=\"true\"} -Method GET -Uri http://169.254.169.254/metadata/instance/compute?api-version=2019-06-01 | format-custom"
tree C:\hostedtoolcache\windows\Python
Expand Down
22 changes: 15 additions & 7 deletions .github/github_org_control/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,34 @@
},
"DRY_RUN": false,
"TEAM_TO_LABEL": {
"openvino-admins": "category: CI",
"openvino-maintainers": "category: IE common",
"openvino-ci-maintainers": "category: CI",
"openvino-maintainers": "category: inference",
"openvino-docs-maintainers": "category: docs",
"openvino-ie-maintainers": "category: IE common",
"openvino-ie-maintainers": "category: inference",
"openvino-ie-cpu-maintainers": "category: CPU",
"openvino-ie-gna-maintainers": "category: GNA",
"openvino-ie-gpu-maintainers": "category: GPU",
"openvino-ie-lpt-maintainers": "category: LP transformations",
"openvino-ie-auto-multi-maintainers": "category: MULTI",
"openvino-ie-python-api-maintainers": "category: python api",
"openvino-ie-transformations-maintainers": "category: transformations",
"openvino-ie-auto-multi-maintainers": "category: AUTO",
"openvino-auto-batch-maintainers": "category: AUTO BATCH",
"openvino-hetero-maintainers": "category: HETERO",
"openvino-ie-python-api-maintainers": "category: Python API",
"openvino-ie-template-maintainers": "category: TEMPLATE",
"openvino-ir-frontend-maintainers": "category: IR FE",
"openvino-ie-paddle-maintainers": "category: PDPD FE",
"openvino-tf-frontend-maintainers": "category: TF FE",
"openvino-onnx-frontend-maintainers": "category: ONNX FE",
"openvino-ie-tests-maintainers": "category: IE Tests",
"openvino-ie-vpu-maintainers": "category: VPU",
"openvino-mo-maintainers": "category: MO",
"openvino-ngraph-maintainers": "category: nGraph",
"openvino-ngraph-maintainers": "category: Core",
"openvino-scripts-maintainers": "category: build",
"openvino-tests-maintainers": "category: IE Tests",
"openvino-tools-maintainers": "category: tools",
"openvino-pot-maintainers": "category: POT",
"openvino-configuration-mgmt": "category: dependency_changes",
"openvino-samples-maintainers": "category: samples"
"openvino-samples-maintainers": "category: samples",
"openvino-c-api-maintainers": "category: C API"
}
}
171 changes: 73 additions & 98 deletions .github/workflows/build_doc.yml
Original file line number Diff line number Diff line change
@@ -1,107 +1,103 @@
name: Documentation
on: [push, pull_request]
on:
pull_request:
push:
branches:
- 'master'
- 'releases/**'

env:
DOXY_VER: '1.9.2'
DOXYREST_VER: '2.1.3'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Build_Doc:
if: github.repository == 'openvinotoolkit/openvino'
runs-on: ubuntu-22.04
runs-on: ubuntu-20.04
steps:
- name: Clone OpenVINO
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: true
lfs: true

# cache from ccache
- name: Cache ccache
id: cache_restore
uses: actions/cache@v3
with:
path: .ccache
key: doc-ccache-cache

- name: Install ccache
uses: hendrikmuhs/[email protected]
with:
key: doc-ccache-cache
save: false

# cache from doxygen build
- name: Cache doxygen make
id: cache_doxygen_make
uses: actions/cache@v3
- name: Install apt-get dependencies
uses: awalsh128/[email protected]
with:
path: doxygen-build
key: build-doxygen-cache
packages: graphviz texlive liblua5.2-0 libclang1-9 libclang-cpp9
version: 3.0

# cache from python packages
- name: Cache python requirements
id: cache_python_requirements
uses: actions/cache@v3
- uses: actions/setup-python@v4
id: cp310
with:
path: ~/.cache/pip
key: doc-python-requirements
python-version: '3.10'
cache: 'pip'
cache-dependency-path: |
docs/requirements.txt
docs/openvino_sphinx_theme/setup.py

- name: Install apt-get tools
uses: awalsh128/[email protected]
# install doc dependencies
with:
packages: graphviz texlive liblua5.2-0
version: 3.0
- name: Install python dependencies
run: |
python3 -m pip install -r docs/requirements.txt
(cd docs/openvino_sphinx_theme && python3 setup.py install)

- name: Install dependencies
- name: Download and install doxygen && doxyrest
run: |
set -e
python3 -m pip install -r docs/requirements.txt --user
cd docs/openvino_sphinx_theme
python3 setup.py install --user
cd ../..
# install doxyrest
wget https://github.com/vovkos/doxyrest/releases/download/doxyrest-2.1.3/doxyrest-2.1.3-linux-amd64.tar.xz
tar -xf doxyrest-2.1.3-linux-amd64.tar.xz
echo "$(pwd)/doxyrest-2.1.3-linux-amd64/bin/" >> $GITHUB_PATH
wget https://github.com/vovkos/doxyrest/releases/download/doxyrest-$DOXYREST_VER/doxyrest-$DOXYREST_VER-linux-amd64.tar.xz
tar -xf doxyrest-$DOXYREST_VER-linux-amd64.tar.xz
echo "$(pwd)/doxyrest-$DOXYREST_VER-linux-amd64/bin/" >> $GITHUB_PATH
# install doxygen
mkdir doxygen
cd doxygen
git clone --depth 1 https://github.com/doxygen/doxygen.git -b Release_1_9_2
cmake \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-S doxygen \
-B ../doxygen-build
cmake --build ../doxygen-build -j`nproc`
sudo cmake --build ../doxygen-build --target install

- name: CMake doc
run: |
cmake \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DENABLE_INTEL_MYRIAD_COMMON=OFF \
-DENABLE_DOCS=ON \
-DCMAKE_BUILD_TYPE=Release \
-B build
wget https://sourceforge.net/projects/doxygen/files/rel-$DOXY_VER/doxygen-$DOXY_VER.linux.bin.tar.gz
tar -xzf doxygen-$DOXY_VER.linux.bin.tar.gz
echo "$(pwd)/doxygen-$DOXY_VER/bin/" >> $GITHUB_PATH

- name: CMake configure
run: cmake -DENABLE_INTEL_MYRIAD_COMMON=OFF -DENABLE_DOCS=ON -B build

- name: Cache documentation
id: cache_sphinx_docs
uses: actions/cache@v3
with:
path: build/docs/_build/.doctrees
key: sphinx-docs-cache

- name: Build doc
run: |
cmake --build build --target sphinx_docs -j`nproc`

- name: Archive HTML

- name: Get number of CPU cores
uses: SimenB/github-actions-cpu-cores@v1
id: cpu-cores

- name: Build docs
run: cmake --build build --target sphinx_docs --parallel ${{ steps.cpu-cores.outputs.count }}

- name: Archive docs HTML
run: (cd build/docs && zip -r openvino_docs_html.zip _build)

- name: Set PR number
run: |
zip -r openvino_html.zip _build
working-directory: build/docs

PR_NUMBER=$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')
echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV

- name: 'Upload doxygen.log'
uses: actions/upload-artifact@v3
with:
name: doxygen_build_log_${{ env.PR_NUMBER }}.log
path: build/docs/doxygen.log

- name: 'Upload sphinx.log'
uses: actions/upload-artifact@v3
with:
name: sphinx_build_log_${{ env.PR_NUMBER }}.log
path: build/docs/sphinx.log

- name: 'Upload docs html'
uses: actions/upload-artifact@v3
with:
name: openvino_docs_html_${{ env.PR_NUMBER }}.zip
path: build/docs/openvino_docs_html.zip

- name: Run Pytest
run: |
pytest --doxygen="./build/docs/doxygen.log" \
Expand All @@ -116,29 +112,8 @@ jobs:
--self-contained-html ./docs/scripts/tests/test_docs.py

- name: 'Upload test results'
if: always()
uses: actions/upload-artifact@v2
if: failure()
uses: actions/upload-artifact@v3
with:
name: openvino_doc_pytest
name: openvino_docs_pytest
path: build/docs/_artifacts/

- name: 'Upload doxygen.log'
if: always()
uses: actions/upload-artifact@v2
with:
name: doxygen_log
path: build/docs/doxygen.log

- name: 'Upload sphinx.log'
if: always()
uses: actions/upload-artifact@v2
with:
name: sphinx_log
path: build/docs/sphinx.log

- name: 'Upload html'
if: always()
uses: actions/upload-artifact@v2
with:
name: openvino_html
path: build/docs/openvino_html.zip
6 changes: 1 addition & 5 deletions .github/workflows/check_pr_commits.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
name: PR Commits
on: [pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Checks:
runs-on: ubuntu-22.04
steps:
- name: Clone OpenVINO
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Install dependencies
run: python3 -m pip install -r ./.github/github_org_control/requirements.txt
Expand Down
21 changes: 7 additions & 14 deletions .github/workflows/code_snippets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
paths:
- '.github/workflows/code_snippets.yml'
- 'docs/snippets/**'
branches:
- 'master'
- 'releases/**'
pull_request:
paths:
- '.github/workflows/code_snippets.yml'
Expand All @@ -22,27 +25,17 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Clone OpenVINO
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive
lfs: true

- name: Check cmake
run: |
which cmake
cmake --version

- name: CMake
run: |
mkdir build
cd build
cmake -DENABLE_INTEL_MYRIAD_COMMON=OFF -DCMAKE_BUILD_TYPE=Release ..
- name: CMake configure
run: cmake -DENABLE_INTEL_MYRIAD_COMMON=OFF -DCMAKE_BUILD_TYPE=Release -B build

- name: Get number of CPU cores
uses: SimenB/github-actions-cpu-cores@v1
id: cpu-cores

- name: Build snippets
run: |
cmake --build . --target ie_docs_snippets -j${{ steps.cpu-cores.outputs.count }}
working-directory: build
run: cmake --build build --target ie_docs_snippets --parallel ${{ steps.cpu-cores.outputs.count }}
Loading