diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml index 29807d755..d5a23d041 100644 --- a/.github/workflows/ccpp_mac.yml +++ b/.github/workflows/ccpp_mac.yml @@ -16,7 +16,7 @@ jobs: ref: 'Nigthly' - name: update submodule profiles working-directory: ./resources/profiles - run: git submodule update + run: git submodule update --init - name: change date in version run: | sed "s/+UNKNOWN/_$(date '+%F')/" version.inc > version.date.inc diff --git a/.github/workflows/ccpp_mac_debug.yml b/.github/workflows/ccpp_mac_debug.yml index c801dbb8a..9f1b6967c 100644 --- a/.github/workflows/ccpp_mac_debug.yml +++ b/.github/workflows/ccpp_mac_debug.yml @@ -16,7 +16,7 @@ jobs: ref: 'debug_macos' - name: update submodule profiles working-directory: ./resources/profiles - run: git submodule update + run: git submodule update --init - name: change date in version run: | sed "s/+UNKNOWN/_$(date '+%F')/" version.inc > version.date.inc diff --git a/.github/workflows/ccpp_ubuntu.yml b/.github/workflows/ccpp_ubuntu.yml index 3726b1dcb..e6cfd3ee0 100644 --- a/.github/workflows/ccpp_ubuntu.yml +++ b/.github/workflows/ccpp_ubuntu.yml @@ -16,7 +16,7 @@ jobs: ref: 'Nigthly' - name: update submodule profiles working-directory: ./resources/profiles - run: git submodule update + run: git submodule update --init - name: change date in version run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc - name: update clock diff --git a/.github/workflows/ccpp_ubuntu_debug.yml b/.github/workflows/ccpp_ubuntu_debug.yml index f567d2e60..212337d43 100644 --- a/.github/workflows/ccpp_ubuntu_debug.yml +++ b/.github/workflows/ccpp_ubuntu_debug.yml @@ -16,7 +16,7 @@ jobs: ref: 'debug_ubuntu' - name: update submodule profiles working-directory: ./resources/profiles - run: git submodule update + run: git submodule update --init - name: change date in version run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc - name: update clock diff --git a/.github/workflows/ccpp_win.yml b/.github/workflows/ccpp_win.yml index a509ab418..b7db161ad 100644 --- a/.github/workflows/ccpp_win.yml +++ b/.github/workflows/ccpp_win.yml @@ -36,7 +36,7 @@ jobs: - uses: ilammy/msvc-dev-cmd@v1 - name: update submodule profiles working-directory: ./resources/profiles - run: git submodule update + run: git submodule update --init - name: change date in version shell: powershell run: (Get-Content version.inc) | Foreach-Object {$_ -replace "\+UNKNOWN", ("_" + [datetime]::Today.ToString("yyyy-MM-dd"))} | Set-Content version.inc diff --git a/.github/workflows/ccpp_win_debug.yml b/.github/workflows/ccpp_win_debug.yml index 4a1789fe9..4d8846790 100644 --- a/.github/workflows/ccpp_win_debug.yml +++ b/.github/workflows/ccpp_win_debug.yml @@ -36,7 +36,7 @@ jobs: - uses: ilammy/msvc-dev-cmd@v1 - name: update submodule profiles working-directory: ./resources/profiles - run: git submodule update + run: git submodule update --init - name: change date in version shell: powershell run: (Get-Content version.inc) | Foreach-Object {$_ -replace "\+UNKNOWN", ("_" + [datetime]::Today.ToString("yyyy-MM-dd"))} | Set-Content version.inc diff --git a/version.inc b/version.inc index 9d68ed5a8..a2577b2a6 100644 --- a/version.inc +++ b/version.inc @@ -10,7 +10,7 @@ set(SLIC3R_APP_CMD "Slic3r") # versions set(SLIC3R_VERSION "2.4") set(SLIC3R_VERSION_FULL "2.4.00.0") -set(SLIC3R_BUILD_ID "Slic3r_${SLIC3R_VERSION_FULL}") +set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}") set(SLIC3R_RC_VERSION "2,4,00,0") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}")