fix compile script

supermerill · May 21, 2021 · 0c7c3b1 · 0c7c3b1
1 parent 1240526
commit 0c7c3b1
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}")