From 5afb30d7dd322da46a72846e07addaa84b57d68b Mon Sep 17 00:00:00 2001 From: SoftFever Date: Thu, 19 Mar 2026 11:58:39 +0800 Subject: [PATCH] Revert "Revert "Extend self-hosted runner support to all platforms" (#12827)" This reverts commit f2eab542a451f5f96429d72f246988fdbdf0fa69, reversing changes made to 7565b279adf3de4111ee1bbffeead58a86dc9673. --- .github/workflows/build_all.yml | 17 +++-- .github/workflows/build_check_cache.yml | 20 ++--- .github/workflows/build_deps.yml | 28 +++---- .github/workflows/build_orca.yml | 97 +++++++++++-------------- 4 files changed, 79 insertions(+), 83 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 41fe9d2302..51b54dd9ab 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -55,7 +55,7 @@ jobs: if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') }} uses: ./.github/workflows/build_check_cache.yml with: - os: ubuntu-24.04 + os: ${{ vars.SELF_HOSTED && 'orca-lnx-server' || 'ubuntu-24.04' }} build-deps-only: ${{ inputs.build-deps-only || false }} secrets: inherit build_windows: @@ -63,7 +63,7 @@ jobs: if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') }} uses: ./.github/workflows/build_check_cache.yml with: - os: windows-latest + os: ${{ vars.SELF_HOSTED && 'orca-win-server' || 'windows-latest' }} build-deps-only: ${{ inputs.build-deps-only || false }} force-build: ${{ github.event_name == 'schedule' }} secrets: inherit @@ -95,7 +95,7 @@ jobs: secrets: inherit unit_tests: name: Unit Tests - runs-on: ubuntu-24.04 + runs-on: ${{ vars.SELF_HOSTED && 'orca-lnx-server' || 'ubuntu-24.04' }} needs: build_linux if: ${{ !cancelled() && success() }} steps: @@ -107,6 +107,7 @@ jobs: scripts tests - name: Apt-Install Dependencies + if: ${{ !vars.SELF_HOSTED }} uses: ./.github/actions/apt-install-deps - name: Restore Test Artifact uses: actions/download-artifact@v7 @@ -148,17 +149,19 @@ jobs: variant: - arch: x86_64 runner: ubuntu-24.04 + self-hosted-runner: orca-lnx-server - arch: aarch64 runner: ubuntu-24.04-arm - # Don't run scheduled builds on forks: - if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') }} - runs-on: ${{ matrix.variant.runner }} + # Don't run scheduled builds on forks; skip aarch64 on self-hosted (no ARM runner) + if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') && (!vars.SELF_HOSTED || matrix.variant.self-hosted-runner) }} + runs-on: ${{ vars.SELF_HOSTED && matrix.variant.self-hosted-runner || matrix.variant.runner }} env: date: ver: ver_pure: steps: - name: "Remove unneeded stuff to free disk space" + if: ${{ !vars.SELF_HOSTED }} run: rm -rf /usr/local/lib/android/* /usr/share/dotnet/* /opt/ghc1/* "/usr/local/share/boost1/*" /opt/hostedtoolcache1/* - uses: actions/checkout@v6 @@ -215,7 +218,7 @@ jobs: name: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak path: '/__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak' - name: Deploy Flatpak to nightly release - if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' + if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && !vars.SELF_HOSTED uses: WebFreak001/deploy-nightly@v3.2.0 with: upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label} diff --git a/.github/workflows/build_check_cache.yml b/.github/workflows/build_check_cache.yml index cbed96824b..7be2cbef2f 100644 --- a/.github/workflows/build_check_cache.yml +++ b/.github/workflows/build_check_cache.yml @@ -30,16 +30,16 @@ jobs: with: lfs: 'true' - - name: set outputs - id: set_outputs - env: - # Keep macOS cache keys and paths architecture-specific. - cache-os: ${{ contains(inputs.os, 'macos') && format('macos-{0}', inputs.arch) || inputs.os }} - dep-folder-name: ${{ contains(inputs.os, 'macos') && format('/{0}', inputs.arch) || '/OrcaSlicer_dep' }} - output-cmd: ${{ inputs.os == 'windows-latest' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}} - run: | - echo cache-key=${{ env.cache-os }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }} - echo cache-path=${{ github.workspace }}/deps/build${{ env.dep-folder-name }} >> ${{ env.output-cmd }} + - name: set outputs + id: set_outputs + env: + # Keep macOS cache keys and paths architecture-specific. + cache-os: ${{ runner.os == 'macOS' && format('macos-{0}', inputs.arch) || (runner.os == 'Windows' && 'windows' || 'linux') }} + dep-folder-name: ${{ runner.os == 'macOS' && format('/{0}', inputs.arch) || '/OrcaSlicer_dep' }} + output-cmd: ${{ runner.os == 'Windows' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}} + run: | + echo cache-key=${{ env.cache-os }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }} + echo cache-path=${{ github.workspace }}/deps/build${{ env.dep-folder-name }} >> ${{ env.output-cmd }} - name: load cache id: cache_deps diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index 0e21091be4..b378193a35 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -49,32 +49,34 @@ jobs: cmakeVersion: "~3.28.0" # use most recent 3.28.x version - name: setup dev on Windows - if: inputs.os == 'windows-latest' + if: runner.os == 'Windows' uses: microsoft/setup-msbuild@v2 - name: Get the date on Ubuntu and macOS - if: inputs.os != 'windows-latest' + if: runner.os != 'Windows' run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV shell: bash - name: Get the date on Windows - if: inputs.os == 'windows-latest' + if: runner.os == 'Windows' run: echo "date=$(Get-Date -Format 'yyyyMMdd')" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8 shell: pwsh # Build Dependencies - name: Build on Windows - if: inputs.os == 'windows-latest' + if: runner.os == 'Windows' working-directory: ${{ github.workspace }} run: | - choco install strawberryperl + if (-not "${{ vars.SELF_HOSTED }}") { + choco install strawberryperl + } .\build_release_vs.bat deps .\build_release_vs.bat pack - cd ${{ github.workspace }}/deps/build + shell: pwsh - name: Build on Mac ${{ inputs.arch }} - if: contains(inputs.os, 'macos') + if: runner.os == 'macOS' working-directory: ${{ github.workspace }} run: | if [ -z "${{ vars.SELF_HOSTED }}" ]; then @@ -86,11 +88,11 @@ jobs: - name: Apt-Install Dependencies - if: inputs.os == 'ubuntu-24.04' + if: runner.os == 'Linux' && !vars.SELF_HOSTED uses: ./.github/actions/apt-install-deps - name: Build on Ubuntu - if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' + if: runner.os == 'Linux' working-directory: ${{ github.workspace }} run: | mkdir -p ${{ github.workspace }}/deps/build/destdir @@ -101,23 +103,23 @@ jobs: # Upload Artifacts # - name: Upload Mac ${{ inputs.arch }} artifacts - # if: contains(inputs.os, 'macos') + # if: runner.os == 'macOS' # uses: actions/upload-artifact@v6 # with: # name: OrcaSlicer_dep_mac_${{ env.date }} # path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.tar.gz - name: Upload Windows artifacts - if: inputs.os == 'windows-latest' + if: runner.os == 'Windows' uses: actions/upload-artifact@v6 with: name: OrcaSlicer_dep_win64_${{ env.date }} path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip - name: Upload Ubuntu artifacts - if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }} + if: runner.os == 'Linux' && !env.ACT env: - ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }} + ubuntu-ver: '2404' uses: actions/upload-artifact@v6 with: name: OrcaSlicer_dep_ubuntu_${{ env.ubuntu-ver }}_${{ env.date }} diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 3cc89d30a7..bc43fc0b86 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -26,6 +26,8 @@ jobs: date: ver: ver_pure: + ubuntu-ver: '2404' + ubuntu-ver-str: '_Ubuntu2404' ORCA_UPDATER_SIG_KEY: ${{ secrets.ORCA_UPDATER_SIG_KEY }} steps: @@ -35,7 +37,7 @@ jobs: lfs: 'true' - name: load cached deps - if: ${{ !(contains(inputs.os, 'macos') && inputs.macos-combine-only) }} + if: ${{ !(runner.os == 'macOS' && inputs.macos-combine-only) }} uses: actions/cache@v5 with: path: ${{ inputs.cache-path }} @@ -47,7 +49,7 @@ jobs: cmakeVersion: "~3.28.0" # use most recent 3.28.x version - name: Get the version and date on Ubuntu and macOS - if: inputs.os != 'windows-latest' + if: runner.os != 'Windows' run: | ver_pure=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2) if [[ "${{ github.event_name }}" == "pull_request" ]]; then @@ -64,7 +66,7 @@ jobs: shell: bash - name: Get the version and date on Windows - if: inputs.os == 'windows-latest' + if: runner.os == 'Windows' run: | $date = Get-Date -Format 'yyyyMMdd' $ref = "${{ github.ref }}" @@ -91,7 +93,7 @@ jobs: # Mac - name: Install tools mac - if: contains(inputs.os, 'macos') && !inputs.macos-combine-only + if: runner.os == 'macOS' && !inputs.macos-combine-only run: | if [ -z "${{ vars.SELF_HOSTED }}" ]; then brew install libtool @@ -100,7 +102,7 @@ jobs: mkdir -p ${{ github.workspace }}/deps/build/${{ inputs.arch }} - name: Free disk space - if: contains(inputs.os, 'macos') && !inputs.macos-combine-only && !vars.SELF_HOSTED + if: runner.os == 'macOS' && !inputs.macos-combine-only && !vars.SELF_HOSTED run: | df -hI /dev/disk3s1s1 sudo find /Applications -maxdepth 1 -type d -name "Xcode_*.app" ! -name "Xcode_15.4.app" -exec rm -rf {} + @@ -108,40 +110,40 @@ jobs: df -hI /dev/disk3s1s1 - name: Build slicer mac - if: contains(inputs.os, 'macos') && !inputs.macos-combine-only + if: runner.os == 'macOS' && !inputs.macos-combine-only working-directory: ${{ github.workspace }} run: | ./build_release_macos.sh -s -n -x ${{ !vars.SELF_HOSTED && '-1' || '' }} -a ${{ inputs.arch }} -t 10.15 - name: Pack macOS app bundle ${{ inputs.arch }} - if: contains(inputs.os, 'macos') && !inputs.macos-combine-only + if: runner.os == 'macOS' && !inputs.macos-combine-only working-directory: ${{ github.workspace }} run: | tar -czvf OrcaSlicer_Mac_bundle_${{ inputs.arch }}_${{ github.sha }}.tar.gz -C build/${{ inputs.arch }} OrcaSlicer - name: Upload macOS app bundle ${{ inputs.arch }} - if: contains(inputs.os, 'macos') && !inputs.macos-combine-only + if: runner.os == 'macOS' && !inputs.macos-combine-only uses: actions/upload-artifact@v6 with: name: OrcaSlicer_Mac_bundle_${{ inputs.arch }}_${{ github.sha }} path: ${{ github.workspace }}/OrcaSlicer_Mac_bundle_${{ inputs.arch }}_${{ github.sha }}.tar.gz - name: Download macOS arm64 app bundle - if: contains(inputs.os, 'macos') && inputs.macos-combine-only + if: runner.os == 'macOS' && inputs.macos-combine-only uses: actions/download-artifact@v7 with: name: OrcaSlicer_Mac_bundle_arm64_${{ github.sha }} path: ${{ github.workspace }}/mac_bundles/arm64 - name: Download macOS x86_64 app bundle - if: contains(inputs.os, 'macos') && inputs.macos-combine-only + if: runner.os == 'macOS' && inputs.macos-combine-only uses: actions/download-artifact@v7 with: name: OrcaSlicer_Mac_bundle_x86_64_${{ github.sha }} path: ${{ github.workspace }}/mac_bundles/x86_64 - name: Extract macOS app bundles - if: contains(inputs.os, 'macos') && inputs.macos-combine-only + if: runner.os == 'macOS' && inputs.macos-combine-only working-directory: ${{ github.workspace }} run: | mkdir -p build/arm64 build/x86_64 @@ -151,13 +153,13 @@ jobs: tar -xzvf "$x86_bundle" -C "${{ github.workspace }}/build/x86_64" - name: Build universal mac app bundle - if: contains(inputs.os, 'macos') && inputs.macos-combine-only + if: runner.os == 'macOS' && inputs.macos-combine-only working-directory: ${{ github.workspace }} run: | ./build_release_macos.sh -u -x ${{ !vars.SELF_HOSTED && '-1' || '' }} -a universal -t 10.15 - name: Delete intermediate per-arch artifacts - if: contains(inputs.os, 'macos') && inputs.macos-combine-only + if: runner.os == 'macOS' && inputs.macos-combine-only uses: geekyeggo/delete-artifact@v5 with: name: | @@ -166,7 +168,7 @@ jobs: # Thanks to RaySajuuk, it's working now - name: Sign app and notary - if: github.repository == 'OrcaSlicer/OrcaSlicer' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && contains(inputs.os, 'macos') && inputs.macos-combine-only + if: github.repository == 'OrcaSlicer/OrcaSlicer' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && runner.os == 'macOS' && inputs.macos-combine-only working-directory: ${{ github.workspace }} env: BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }} @@ -220,7 +222,7 @@ jobs: fi - name: Create DMG without notary - if: github.ref != 'refs/heads/main' && contains(inputs.os, 'macos') && inputs.macos-combine-only + if: github.ref != 'refs/heads/main' && runner.os == 'macOS' && inputs.macos-combine-only working-directory: ${{ github.workspace }} run: | mkdir -p ${{ github.workspace }}/build/universal/OrcaSlicer_dmg @@ -239,14 +241,14 @@ jobs: fi - name: Upload artifacts mac - if: contains(inputs.os, 'macos') && inputs.macos-combine-only + if: runner.os == 'macOS' && inputs.macos-combine-only uses: actions/upload-artifact@v6 with: name: OrcaSlicer_Mac_universal_${{ env.ver }} path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg - name: Upload OrcaSlicer_profile_validator DMG mac - if: contains(inputs.os, 'macos') && inputs.macos-combine-only + if: runner.os == 'macOS' && inputs.macos-combine-only uses: actions/upload-artifact@v6 with: name: OrcaSlicer_profile_validator_Mac_universal_DMG_${{ env.ver }} @@ -254,7 +256,7 @@ jobs: if-no-files-found: ignore - name: Deploy Mac release - if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && contains(inputs.os, 'macos') && inputs.macos-combine-only + if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && runner.os == 'macOS' && inputs.macos-combine-only && !vars.SELF_HOSTED uses: WebFreak001/deploy-nightly@v3.2.0 with: upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label} @@ -265,7 +267,7 @@ jobs: max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted - name: Deploy Mac OrcaSlicer_profile_validator DMG release - if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && contains(inputs.os, 'macos') && inputs.macos-combine-only + if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && runner.os == 'macOS' && inputs.macos-combine-only && !vars.SELF_HOSTED uses: WebFreak001/deploy-nightly@v3.2.0 with: upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label} @@ -277,17 +279,17 @@ jobs: # Windows - name: setup MSVC - if: inputs.os == 'windows-latest' + if: runner.os == 'Windows' uses: microsoft/setup-msbuild@v2 - name: Install nsis - if: inputs.os == 'windows-latest' + if: runner.os == 'Windows' && !vars.SELF_HOSTED run: | dir "C:/Program Files (x86)/Windows Kits/10/Include" choco install nsis - name: Build slicer Win - if: inputs.os == 'windows-latest' + if: runner.os == 'Windows' working-directory: ${{ github.workspace }} env: WindowsSdkDir: 'C:\Program Files (x86)\Windows Kits\10\' @@ -295,53 +297,53 @@ jobs: run: .\build_release_vs.bat slicer - name: Create installer Win - if: inputs.os == 'windows-latest' + if: runner.os == 'Windows' working-directory: ${{ github.workspace }}/build run: | cpack -G NSIS - name: Pack app - if: inputs.os == 'windows-latest' + if: runner.os == 'Windows' working-directory: ${{ github.workspace }}/build shell: cmd run: '"C:/Program Files/7-Zip/7z.exe" a -tzip OrcaSlicer_Windows_${{ env.ver }}_portable.zip ${{ github.workspace }}/build/OrcaSlicer' - name: Pack PDB - if: inputs.os == 'windows-latest' + if: runner.os == 'Windows' working-directory: ${{ github.workspace }}/build/src/Release shell: cmd run: '"C:/Program Files/7-Zip/7z.exe" a -m0=lzma2 -mx9 Debug_PDB_${{ env.ver }}_for_developers_only.7z *.pdb' - name: Upload artifacts Win zip - if: inputs.os == 'windows-latest' + if: runner.os == 'Windows' uses: actions/upload-artifact@v6 with: name: OrcaSlicer_Windows_${{ env.ver }}_portable path: ${{ github.workspace }}/build/OrcaSlicer - name: Upload artifacts Win installer - if: inputs.os == 'windows-latest' + if: runner.os == 'Windows' uses: actions/upload-artifact@v6 with: name: OrcaSlicer_Windows_${{ env.ver }} path: ${{ github.workspace }}/build/OrcaSlicer*.exe - name: Upload artifacts Win PDB - if: inputs.os == 'windows-latest' + if: runner.os == 'Windows' uses: actions/upload-artifact@v6 with: name: PDB path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z - name: Upload OrcaSlicer_profile_validator Win - if: inputs.os == 'windows-latest' + if: runner.os == 'Windows' uses: actions/upload-artifact@v6 with: name: OrcaSlicer_profile_validator_Windows_${{ env.ver }} path: ${{ github.workspace }}/build/src/Release/OrcaSlicer_profile_validator.exe - name: Deploy Windows release portable - if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && inputs.os == 'windows-latest' + if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && runner.os == 'Windows' && !vars.SELF_HOSTED uses: WebFreak001/deploy-nightly@v3.2.0 with: upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label} @@ -352,7 +354,7 @@ jobs: max_releases: 1 - name: Deploy Windows release installer - if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && inputs.os == 'windows-latest' + if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && runner.os == 'Windows' && !vars.SELF_HOSTED uses: WebFreak001/deploy-nightly@v3.2.0 with: upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label} @@ -363,7 +365,7 @@ jobs: max_releases: 1 - name: Deploy Windows OrcaSlicer_profile_validator release - if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && inputs.os == 'windows-latest' + if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && runner.os == 'Windows' && !vars.SELF_HOSTED uses: WebFreak001/deploy-nightly@v3.2.0 with: upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label} @@ -375,16 +377,14 @@ jobs: # Ubuntu - name: Apt-Install Dependencies - if: inputs.os == 'ubuntu-24.04' + if: runner.os == 'Linux' && !vars.SELF_HOSTED uses: ./.github/actions/apt-install-deps # Tests must built at the same time as the slicer; # if you untangle them feel free to separate them here too - name: Build slicer and tests - if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' + if: runner.os == 'Linux' shell: bash - env: - ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }} run: | ./build_linux.sh -istr mv -n ./build/OrcaSlicer_Linux_V${{ env.ver_pure }}.AppImage ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage @@ -394,7 +394,7 @@ jobs: # Use tar because upload-artifacts won't always preserve directory structure # and doesn't preserve file permissions - name: Upload Test Artifact - if: inputs.os == 'ubuntu-24.04' + if: runner.os == 'Linux' uses: actions/upload-artifact@v6 with: name: ${{ github.sha }}-tests @@ -404,7 +404,7 @@ jobs: if-no-files-found: error - name: Build orca_custom_preset_tests - if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04' + if: github.ref == 'refs/heads/main' && runner.os == 'Linux' working-directory: ${{ github.workspace }}/build/src/Release shell: bash run: | @@ -413,28 +413,21 @@ jobs: zip -r orca_custom_preset_tests.zip user/ - name: Upload artifacts Ubuntu - if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }} - env: - ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }} - ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }} + if: ${{ ! env.ACT && runner.os == 'Linux' }} uses: actions/upload-artifact@v6 with: name: OrcaSlicer_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }} path: './build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage' - name: Upload OrcaSlicer_profile_validator Ubuntu - if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }} - env: - ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }} + if: ${{ ! env.ACT && runner.os == 'Linux' }} uses: actions/upload-artifact@v6 with: name: OrcaSlicer_profile_validator_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }} path: './build/src/Release/OrcaSlicer_profile_validator' - name: Deploy Ubuntu release - if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }} - env: - ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }} + if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED }} uses: WebFreak001/deploy-nightly@v3.2.0 with: upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label} @@ -444,7 +437,7 @@ jobs: asset_content_type: application/octet-stream max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted - name: Deploy Ubuntu release - if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04' }} + if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED }} uses: rickstaa/action-create-tag@v1 with: tag: "nightly-builds" @@ -453,9 +446,7 @@ jobs: message: "nightly-builds" - name: Deploy Ubuntu OrcaSlicer_profile_validator release - if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }} - env: - ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }} + if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED }} uses: WebFreak001/deploy-nightly@v3.2.0 with: upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label} @@ -466,7 +457,7 @@ jobs: max_releases: 1 - name: Deploy orca_custom_preset_tests - if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04' }} + if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED }} uses: WebFreak001/deploy-nightly@v3.2.0 with: upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}