diff options
author | remi durand <remi-j.durand@thalesgroup.com> | 2021-05-22 12:06:20 +0300 |
---|---|---|
committer | remi durand <remi-j.durand@thalesgroup.com> | 2021-05-22 12:06:20 +0300 |
commit | 439938956084cf6bfb05d58ab6ce3fd13549ca73 (patch) | |
tree | 9d216d1bba30a1d70927a54651b3eb569b1b3c2b /.github | |
parent | 600bbaa6d1d5eaaf4f8a3d2adcff0e4529cc9a56 (diff) | |
parent | 0c7c3b125524c9e8901f075bb7aa220b2aae8a7b (diff) |
Merge branch 'merill-merge'2.3.56.0
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/ccpp_mac.yml | 5 | ||||
-rw-r--r-- | .github/workflows/ccpp_mac_debug.yml | 5 | ||||
-rw-r--r-- | .github/workflows/ccpp_ubuntu.yml | 5 | ||||
-rw-r--r-- | .github/workflows/ccpp_ubuntu_debug.yml | 5 | ||||
-rw-r--r-- | .github/workflows/ccpp_win.yml | 12 | ||||
-rw-r--r-- | .github/workflows/ccpp_win_debug.yml | 12 |
6 files changed, 34 insertions, 10 deletions
diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml index 22ef4471f..be4597ab7 100644 --- a/.github/workflows/ccpp_mac.yml +++ b/.github/workflows/ccpp_mac.yml @@ -19,7 +19,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 @@ -52,6 +52,9 @@ jobs: - name: make SuperSlicer working-directory: ./build run: make Slic3r + - name: make .mo + working-directory: ./build + run: make gettext_po_to_mo - name: update Info.plist working-directory: ./build/src run: sed "s/+UNKNOWN/_$(date '+%F')/" Info.plist >Info.date.plist diff --git a/.github/workflows/ccpp_mac_debug.yml b/.github/workflows/ccpp_mac_debug.yml index 74274e0af..1e9166ca9 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 @@ -49,6 +49,9 @@ jobs: - name: make SuperSlicer working-directory: ./build run: make Slic3r + - name: make .mo + working-directory: ./build + run: make gettext_po_to_mo - name: update Info.plist working-directory: ./build/src run: sed "s/+UNKNOWN/_$(date '+%F')/" Info.plist >Info.date.plist diff --git a/.github/workflows/ccpp_ubuntu.yml b/.github/workflows/ccpp_ubuntu.yml index b112ee4ec..5a0e3e4d4 100644 --- a/.github/workflows/ccpp_ubuntu.yml +++ b/.github/workflows/ccpp_ubuntu.yml @@ -19,7 +19,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 @@ -53,6 +53,9 @@ jobs: - name: make SuperSlicer working-directory: ./build run: make Slic3r + - name: make .mo + working-directory: ./build + run: make gettext_po_to_mo - name: create directory and copy into it working-directory: ./build run: | diff --git a/.github/workflows/ccpp_ubuntu_debug.yml b/.github/workflows/ccpp_ubuntu_debug.yml index d295378d0..90e64f90a 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 @@ -50,6 +50,9 @@ jobs: - name: make SuperSlicer working-directory: ./build run: make SuperSlicer + - name: make .mo + working-directory: ./build + run: make gettext_po_to_mo - name: create directory and copy into it working-directory: ./build run: | diff --git a/.github/workflows/ccpp_win.yml b/.github/workflows/ccpp_win.yml index 6641461c7..5beceeec5 100644 --- a/.github/workflows/ccpp_win.yml +++ b/.github/workflows/ccpp_win.yml @@ -39,7 +39,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 @@ -62,6 +62,9 @@ jobs: - name: make working-directory: ./build run: msbuild /m /P:Configuration=Release INSTALL.vcxproj + - name: make .mo + working-directory: ./build + run: msbuild /m /P:Configuration=Release gettext_po_to_mo.vcxproj - name: create directory and copy into it working-directory: ./build run: ls @@ -78,10 +81,13 @@ jobs: working-directory: ./build shell: cmd run: '"C:/Program Files/7-Zip/7z.exe" x SuperSlicer_2.2.53.3_win64_20201005.zip' - - name: copy old release content + - name: copy missing dll content from old release working-directory: ./build shell: cmd - run: xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\* package\ + run: | + xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\*.dll package\ + xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\*.bat package\ + xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\mesa package\ - name: copy new resources working-directory: ./build shell: cmd diff --git a/.github/workflows/ccpp_win_debug.yml b/.github/workflows/ccpp_win_debug.yml index 3d6c73281..ae007ac49 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 @@ -59,6 +59,9 @@ jobs: - name: make working-directory: ./build run: msbuild /m /P:Configuration=Debug INSTALL.vcxproj + - name: make .mo + working-directory: ./build + run: msbuild /m /P:Configuration=Debug gettext_po_to_mo.vcxproj - name: create directory and copy into it working-directory: ./build run: ls @@ -75,10 +78,13 @@ jobs: working-directory: ./build shell: cmd run: '"C:/Program Files/7-Zip/7z.exe" x SuperSlicer_2.2.53.3_win64_20201005.zip' - - name: copy old release content + - name: copy missing dll content from old release working-directory: ./build shell: cmd - run: xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\* package\ + run: | + xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\*.dll package\ + xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\*.bat package\ + xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\mesa package\ - name: copy new resources working-directory: ./build shell: cmd |