From dc3631bd40003b70b7ec4ef48d259c6033bdde9b Mon Sep 17 00:00:00 2001 From: Michael Rapp Date: Sat, 22 Jun 2024 15:44:09 +0200 Subject: [PATCH] Format YAML files. --- .github/workflows/merge_bugfix.yml | 9 ++++---- .github/workflows/merge_feature.yml | 9 ++++---- .github/workflows/merge_release.yml | 6 +++-- .github/workflows/release.yml | 4 +++- .github/workflows/release_development.yml | 9 ++++---- .github/workflows/template_publish.yml | 1 + .../workflows/template_publish_non_native.yml | 13 ++++++----- .../workflows/template_publish_platform.yml | 22 +++++++++++++------ .github/workflows/template_publish_pure.yml | 8 ++++--- .github/workflows/test_build.yml | 17 +++++++++----- .github/workflows/test_doc.yml | 6 ++++- .github/workflows/test_format.yml | 6 ++++- .github/workflows/test_release.yml | 6 ++++- .readthedocs.yaml | 5 +++-- 14 files changed, 80 insertions(+), 41 deletions(-) diff --git a/.github/workflows/merge_bugfix.yml b/.github/workflows/merge_bugfix.yml index 71e7f199f2..00234eca4b 100644 --- a/.github/workflows/merge_bugfix.yml +++ b/.github/workflows/merge_bugfix.yml @@ -1,8 +1,9 @@ +--- name: Merge bugfix into feature branch on: push: branches: - - 'bugfix' + - bugfix jobs: merge_bugfix: name: Merge bugfix into feature branch @@ -30,11 +31,11 @@ jobs: uses: peter-evans/create-pull-request@v6 with: token: ${{ steps.app-token.outputs.token }} - commit-message: "[Bot] Merge bugfix into feature branch." + commit-message: '[Bot] Merge bugfix into feature branch.' branch: merge-bugfix - title: "Merge bugfix into feature branch" + title: Merge bugfix into feature branch labels: bot - body: "Merge branch \"bugfix\" into \"feature\"." + body: Merge branch "bugfix" into "feature". - name: Enable auto-merge env: GH_TOKEN: ${{ steps.app-token.outputs.token }} diff --git a/.github/workflows/merge_feature.yml b/.github/workflows/merge_feature.yml index f2a7bae7ac..e0bd4efc18 100644 --- a/.github/workflows/merge_feature.yml +++ b/.github/workflows/merge_feature.yml @@ -1,8 +1,9 @@ +--- name: Merge feature into main branch on: push: branches: - - 'feature' + - feature jobs: merge_feature: name: Merge feature into main branch @@ -30,11 +31,11 @@ jobs: uses: peter-evans/create-pull-request@v6 with: token: ${{ steps.app-token.outputs.token }} - commit-message: "[Bot] Merge feature into main branch." + commit-message: '[Bot] Merge feature into main branch.' branch: merge-feature - title: "Merge feature into main branch" + title: Merge feature into main branch labels: bot - body: "Merge branch \"feature\" into \"main\"." + body: Merge branch "feature" into "main". - name: Enable auto-merge env: GH_TOKEN: ${{ steps.app-token.outputs.token }} diff --git a/.github/workflows/merge_release.yml b/.github/workflows/merge_release.yml index a6d9226ab0..1d6b7d1e78 100644 --- a/.github/workflows/merge_release.yml +++ b/.github/workflows/merge_release.yml @@ -1,7 +1,9 @@ +--- name: Merge into upstream branches on: release: - types: [ published ] + types: + - published jobs: merge_release: name: Merge into upstream branches @@ -73,7 +75,7 @@ jobs: git push origin bugfix - name: Update patch version if: ${{ github.event.release.target_commitish == 'bugfix' }} - run: | + run: |- git checkout bugfix ./build increment_patch_version git add VERSION diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e5da1b1e2b..5ca92cabda 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,9 @@ +--- name: Publish release packages on: release: - types: [ published ] + types: + - published jobs: publish_packages: name: Publish wheel packages diff --git a/.github/workflows/release_development.yml b/.github/workflows/release_development.yml index 1ee8bc09be..c350c697b6 100644 --- a/.github/workflows/release_development.yml +++ b/.github/workflows/release_development.yml @@ -1,14 +1,15 @@ +--- name: Publish development packages on: push: branches: - - 'main' + - main paths: - - 'cpp/**/include/**' - - 'cpp/**/src/**' + - cpp/**/include/** + - cpp/**/src/** - '**/*.pxd' - '**/*.pyx' - - 'python/**/mlrl/**' + - python/**/mlrl/** jobs: update_development_version: name: Update development version diff --git a/.github/workflows/template_publish.yml b/.github/workflows/template_publish.yml index 7192237bb2..809421f29f 100644 --- a/.github/workflows/template_publish.yml +++ b/.github/workflows/template_publish.yml @@ -1,3 +1,4 @@ +--- name: Publish wheel packages on: workflow_call: diff --git a/.github/workflows/template_publish_non_native.yml b/.github/workflows/template_publish_non_native.yml index 81f8f0413d..f0c3670386 100644 --- a/.github/workflows/template_publish_non_native.yml +++ b/.github/workflows/template_publish_non_native.yml @@ -1,3 +1,4 @@ +--- name: Publish non-native platform wheels on: workflow_call: @@ -22,7 +23,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest] + os: + - ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 @@ -37,17 +39,18 @@ jobs: - name: Build package uses: pypa/cibuildwheel@v2.17 env: - CIBW_BEFORE_BUILD_LINUX: ./build --clean && SUBPROJECTS=${{ inputs.subproject }} TEST_SUPPORT=disabled GPU_SUPPORT=disabled ./build install + CIBW_BEFORE_BUILD_LINUX: ./build --clean && SUBPROJECTS=${{ inputs.subproject }} TEST_SUPPORT=disabled GPU_SUPPORT=disabled + ./build install CIBW_BUILD_FRONTEND: build CIBW_ARCHS_LINUX: aarch64 - CIBW_SKIP: 'pp* *musllinux*' + CIBW_SKIP: pp* *musllinux* with: package-dir: python/subprojects/${{ inputs.subproject }}/ - name: Setup Python if: ${{ inputs.pypi_repository }} uses: actions/setup-python@v5 with: - python-version: '3.x' + python-version: 3.x - name: Upload wheels to PyPI if: ${{ inputs.pypi_repository }} env: @@ -62,5 +65,5 @@ jobs: uses: actions/upload-artifact@v4 with: name: wheels-${{ inputs.subproject }}-${{ runner.os }}-aarch64 - path: 'wheelhouse/*.whl' + path: wheelhouse/*.whl if-no-files-found: error diff --git a/.github/workflows/template_publish_platform.yml b/.github/workflows/template_publish_platform.yml index 15c34d3eed..3818b45108 100644 --- a/.github/workflows/template_publish_platform.yml +++ b/.github/workflows/template_publish_platform.yml @@ -1,3 +1,4 @@ +--- name: Publish platform wheels on: workflow_call: @@ -22,7 +23,10 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: + - ubuntu-latest + - macos-latest + - windows-latest steps: - name: Checkout uses: actions/checkout@v4 @@ -41,19 +45,23 @@ jobs: - name: Build package uses: pypa/cibuildwheel@v2.17 env: - CIBW_BEFORE_BUILD_LINUX: ./build --clean && SUBPROJECTS=${{ inputs.subproject }} TEST_SUPPORT=disabled GPU_SUPPORT=disabled ./build install - CIBW_BEFORE_BUILD_MACOS: rm -rf venv && ./build --clean && SUBPROJECTS=${{ inputs.subproject }} TEST_SUPPORT=disabled GPU_SUPPORT=disabled CPLUS_INCLUDE_PATH=/opt/homebrew/opt/libomp/include/ LIBRARY_PATH=/opt/homebrew/opt/libomp/lib/ ./build install - CIBW_BEFORE_BUILD_WINDOWS: .\build.bat --clean && set SUBPROJECTS=${{ inputs.subproject }} && set TEST_SUPPORT=disabled && set GPU_SUPPORT=disabled && .\build.bat install + CIBW_BEFORE_BUILD_LINUX: ./build --clean && SUBPROJECTS=${{ inputs.subproject }} TEST_SUPPORT=disabled GPU_SUPPORT=disabled + ./build install + CIBW_BEFORE_BUILD_MACOS: rm -rf venv && ./build --clean && SUBPROJECTS=${{ inputs.subproject }} TEST_SUPPORT=disabled + GPU_SUPPORT=disabled CPLUS_INCLUDE_PATH=/opt/homebrew/opt/libomp/include/ LIBRARY_PATH=/opt/homebrew/opt/libomp/lib/ + ./build install + CIBW_BEFORE_BUILD_WINDOWS: .\build.bat --clean && set SUBPROJECTS=${{ inputs.subproject }} && set TEST_SUPPORT=disabled + && set GPU_SUPPORT=disabled && .\build.bat install CIBW_BUILD_FRONTEND: build CIBW_ARCHS: auto64 - CIBW_SKIP: 'pp* *musllinux*' + CIBW_SKIP: pp* *musllinux* with: package-dir: python/subprojects/${{ inputs.subproject }}/ - name: Setup Python if: ${{ inputs.pypi_repository }} uses: actions/setup-python@v5 with: - python-version: '3.x' + python-version: 3.x - name: Upload wheels to PyPI if: ${{ inputs.pypi_repository }} env: @@ -68,5 +76,5 @@ jobs: uses: actions/upload-artifact@v4 with: name: wheels-${{ inputs.subproject }}-${{ runner.os }}-x86_64 - path: 'wheelhouse/*.whl' + path: wheelhouse/*.whl if-no-files-found: error diff --git a/.github/workflows/template_publish_pure.yml b/.github/workflows/template_publish_pure.yml index e5b40fe2ba..0b0b9c0f0e 100644 --- a/.github/workflows/template_publish_pure.yml +++ b/.github/workflows/template_publish_pure.yml @@ -1,3 +1,4 @@ +--- name: Publish pure wheels on: workflow_call: @@ -19,7 +20,8 @@ on: jobs: publish_pure_wheels: name: Publish pure wheels - runs-on: [ubuntu-latest] + runs-on: + - ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 @@ -35,7 +37,7 @@ jobs: if: ${{ inputs.pypi_repository }} uses: actions/setup-python@v5 with: - python-version: '3.x' + python-version: 3.x - name: Upload wheels to PyPI if: ${{ inputs.pypi_repository }} env: @@ -50,5 +52,5 @@ jobs: uses: actions/upload-artifact@v4 with: name: wheels-${{ inputs.subproject }}-any - path: 'wheelhouse/*.whl' + path: wheelhouse/*.whl if-no-files-found: error diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 5b6f7071d3..32b8e66386 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -1,7 +1,11 @@ +--- name: Test build on: pull_request: - types: [opened, reopened, synchronize] + types: + - opened + - reopened + - synchronize jobs: changes: name: Detect changes @@ -94,7 +98,7 @@ jobs: if: ${{ needs.changes.outputs.cpp_tests == 'true' }} && (success() || failure()) uses: EnricoMi/publish-unit-test-result-action@v2 with: - check_name: "C++ Test Results" + check_name: C++ Test Results files: | cpp/build/meson-logs/testlog.junit.xml - name: Test Python code @@ -104,7 +108,7 @@ jobs: if: ${{ needs.changes.outputs.python_tests == 'true' }} && (success() || failure()) uses: EnricoMi/publish-unit-test-result-action@v2 with: - check_name: "Python Test Results" + check_name: Python Test Results files: | python/build/test-results/*.xml macos_build: @@ -131,14 +135,15 @@ jobs: with: key: ${{ runner.os }}-test-build-ccache - name: Compile via Clang - run: TEST_SUPPORT=disabled CPLUS_INCLUDE_PATH=/opt/homebrew/opt/libomp/include/:/opt/homebrew/opt/opencl-clhpp-headers/include/ LIBRARY_PATH=/opt/homebrew/opt/libomp/lib/ ./build compile + run: TEST_SUPPORT=disabled CPLUS_INCLUDE_PATH=/opt/homebrew/opt/libomp/include/:/opt/homebrew/opt/opencl-clhpp-headers/include/ + LIBRARY_PATH=/opt/homebrew/opt/libomp/lib/ ./build compile windows_build: needs: changes if: ${{ needs.changes.outputs.cpp == 'true' }} name: Test Windows build runs-on: windows-latest env: - SCCACHE_GHA_ENABLED: "true" + SCCACHE_GHA_ENABLED: 'true' steps: - name: Look up Git repository in cache uses: actions/cache/restore@v4 @@ -161,7 +166,7 @@ jobs: - name: Prepare sccache uses: mozilla-actions/sccache-action@v0.0.4 - name: Compile via MSVC - run: | + run: |- $env:TEST_SUPPORT = "disabled" $env:INCLUDE += ";$($pwd.Path)\vcpkg\packages\opencl_x64-windows\include" $env:LIB += ";$($pwd.Path)\vcpkg\packages\opencl_x64-windows\lib" diff --git a/.github/workflows/test_doc.yml b/.github/workflows/test_doc.yml index 6dd558f6d6..f46ce17a92 100644 --- a/.github/workflows/test_doc.yml +++ b/.github/workflows/test_doc.yml @@ -1,7 +1,11 @@ +--- name: Test building documentation on: pull_request: - types: [opened, reopened, synchronize] + types: + - opened + - reopened + - synchronize jobs: changes: name: Detect changes diff --git a/.github/workflows/test_format.yml b/.github/workflows/test_format.yml index 25126fdb55..aaf80e3de3 100644 --- a/.github/workflows/test_format.yml +++ b/.github/workflows/test_format.yml @@ -1,7 +1,11 @@ +--- name: Check code style on: pull_request: - types: [opened, reopened, synchronize] + types: + - opened + - reopened + - synchronize jobs: test_format: name: Check code style diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml index 3d35ae90fb..6517359a15 100644 --- a/.github/workflows/test_release.yml +++ b/.github/workflows/test_release.yml @@ -1,7 +1,11 @@ +--- name: Test publishing packages on: pull_request: - types: [opened, reopened, synchronize] + types: + - opened + - reopened + - synchronize jobs: changes: name: Detect changes diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 7f191d50ac..1a28024003 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,8 +1,9 @@ +--- version: 2 build: - os: "ubuntu-lts-latest" + os: ubuntu-lts-latest tools: - python: "latest" + python: latest apt_packages: - doxygen commands: