mirror of
https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git
synced 2025-08-05 00:50:41 +08:00
Fix build errors on main branch caused by version string
This commit is contained in:
parent
afb89c4309
commit
aac618dcb7
8
.github/workflows/build_orca.yml
vendored
8
.github/workflows/build_orca.yml
vendored
@ -36,9 +36,7 @@ jobs:
|
|||||||
- name: Get the version and date on Ubuntu and macOS
|
- name: Get the version and date on Ubuntu and macOS
|
||||||
if: inputs.os != 'windows-latest'
|
if: inputs.os != 'windows-latest'
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ github.ref }}" == "refs/heads/main" ]; then
|
if [[ "${{ github.event_name }}" == "pull_request" ]]; then
|
||||||
ver="nightly$(date +'%y%m%d')"
|
|
||||||
elif [[ "${{ github.event_name }}" == "pull_request" ]]; then
|
|
||||||
ver="PR${{ github.event.number }}"
|
ver="PR${{ github.event.number }}"
|
||||||
else
|
else
|
||||||
ver=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2)
|
ver=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2)
|
||||||
@ -56,9 +54,7 @@ jobs:
|
|||||||
$eventName = "${{ github.event_name }}"
|
$eventName = "${{ github.event_name }}"
|
||||||
$prNumber = "${{ github.event.number }}"
|
$prNumber = "${{ github.event.number }}"
|
||||||
|
|
||||||
if ($ref -eq 'refs/heads/main') {
|
if ($eventName -eq 'pull_request') {
|
||||||
$ver = "nightly" + $date.Substring(2)
|
|
||||||
} elseif ($eventName -eq 'pull_request') {
|
|
||||||
$ver = "PR" + $prNumber
|
$ver = "PR" + $prNumber
|
||||||
} else {
|
} else {
|
||||||
$versionContent = Get-Content version.inc -Raw
|
$versionContent = Get-Content version.inc -Raw
|
||||||
|
Loading…
x
Reference in New Issue
Block a user