Fix forgotten git conflict #26
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # SPDX-FileCopyrightText: 2025 Howetuft, Johannes Hinrichs (CodeFHD) | ||
| # | ||
| # SPDX-License-Identifier: GPL-3.0-or-later | ||
| name: BlendLuxCore Build Bundle | ||
| on: | ||
| pull_request: | ||
| inputs: | ||
| build_type: | ||
| required: false | ||
| type: string | ||
| default: "Latest" | ||
| workflow_call: | ||
| inputs: | ||
| build_type: | ||
| required: true | ||
| type: string | ||
| default: "Latest" | ||
| workflow_dispatch: | ||
| inputs: | ||
| build_type: | ||
| required: true | ||
| type: string | ||
| default: "Release" | ||
| jobs: | ||
| build_bundle: | ||
| name: Build bundle | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout main repository | ||
| uses: actions/checkout@v4 | ||
| - name: Prepare Blender install | ||
| uses: gerlero/apt-install@v1 | ||
| with: | ||
| packages: libxxf86vm1 libxfixes3 libxi6 libxkbcommon0 libgl1 | ||
| - name: Prepare Python | ||
| run: touch requirements.txt | ||
| - name: Set up Python | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: '3.11' | ||
| - name: Set up Blender | ||
| uses: moguri/setup-blender@v1 | ||
| with: | ||
| blender-version: '4.2.8' | ||
| - name: Set up cmake | ||
| uses: lukka/get-cmake@latest | ||
| - name: Package bundle | ||
| shell: bash | ||
| run: | | ||
| build_dir="${{ github.workspace }}/build" | ||
| mkdir ${build_dir} | ||
| cmake -B ${build_dir} -S . -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} | ||
| cmake --build ${build_dir} | ||
| - name: Upload artifact | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: "BlendLuxCore" | ||
| <<<<<<< HEAD | ||
| path: "${{ github.workspace }}/build/out/BlendLuxCore-*.zip" | ||
| ======= | ||
| path: "${{ github.workspace }}/build/BlendLuxCore-*.zip" | ||
| >>>>>>> 9c294874 (Build bundle workflow: add worflow_dispatch) | ||