fixes for Master 27 under Linux

.github/workflows/ccpp_mac.yml

@@ -1,29 +1,32 @@
 name: C/C++ Nightly macos
 
 on:
-  push:
-    branches:
-      - Nigthly
-      - nightly_dev
-      - nightly_master
-      - debug_macos
+  workflow_dispatch:
 
 jobs:
   build:
 
-    runs-on: macos-11
+    runs-on: macos-12
 
     steps:
     - uses: actions/checkout@v3
     - name: build deps & slicer
-      run: ./BuildMacOS.sh -i
+      run: ./BuildMacOS.sh
+    - name: copy zstd
+      run: cp /usr/local/opt/zstd/lib/libzstd.1.dylib ./build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app/Contents/MacOS/libzstd.1.dylib
+    - name: relink zstd
+      run: install_name_tool -change /usr/local/opt/zstd/lib/libzstd.1.dylib  @executable_path/libzstd.1.dylib ./build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app/Contents/MacOS/${{ github.event.repository.name }}
+    - name: create the dmg
+      run: |
+        hdiutil create -ov -fs HFS+ -volname ${{ github.event.repository.name }} -srcfolder "build/pack/${{ github.event.repository.name }}" temp.dmg
+        hdiutil convert temp.dmg -format UDZO -o ${{ github.event.repository.name }}.dmg
     - name: Upload artifact
       uses: actions/[email protected]
       with:
-        name: nightly_macos.tar
-        path: build/${{ github.event.repository.name }}.tar
+        name: nightly_macos.app
+        path: build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app
     - name: Upload artifact
       uses: actions/[email protected]
       with:
         name: nightly_macos.dmg
-        path: build/${{ github.event.repository.name }}.dmg
+        path: ${{ github.event.repository.name }}.dmg

.github/workflows/ccpp_mac_arm.yml

@@ -1,12 +1,7 @@
 name: C/C++ Nightly arm macos
 
 on:
-  push:
-    branches:
-      - Nigthly
-      - nightly_dev
-      - nightly_master
-      - debug_macos
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_mac_arm_debug.yml

@@ -1,9 +1,7 @@
 name: C/C++ debug arm macos
 
 on:
-  push:
-    branches:
-      - debug_macos
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_mac_arm_rc.yml

@@ -1,9 +1,7 @@
 name: C/C++ Release candidate arm macos
 
 on:
-  push:
-    branches:
-      - rc
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_mac_debug.yml

@@ -1,21 +1,27 @@
 name: C/C++ debug macos
 
 on:
-  push:
-    branches:
-      - debug_macos
+  workflow_dispatch:
 
 jobs:
   build:
 
-    runs-on: macos-11
+    runs-on: macos-12
 
     steps:
     - uses: actions/checkout@v2
       with:
         ref: 'debug_macos'
     - name: build deps & slicer
-      run: ./BuildMacOS.sh -bi
+      run: ./BuildMacOS.sh -b
+    - name: copy zstd
+      run: cp /usr/local/opt/zstd/lib/libzstd.1.dylib ./build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app/Contents/MacOS/libzstd.1.dylib
+    - name: relink zstd
+      run: install_name_tool -change /usr/local/opt/zstd/lib/libzstd.1.dylib  @executable_path/libzstd.1.dylib ./build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app/Contents/MacOS/${{ github.event.repository.name }}
+    - name: create the dmg
+      run: |
+        hdiutil create -ov -fs HFS+ -volname ${{ github.event.repository.name }} -srcfolder build/pack/${{ github.event.repository.name }} temp.dmg
+        hdiutil convert temp.dmg -format UDZO -o ${{ github.event.repository.name }}.dmg
     - name: tar the pack
       working-directory: ./build
       run: ls
@@ -28,4 +34,4 @@ jobs:
       uses: actions/[email protected]
       with:
         name: nightly_macos.tar
-        path: build/${{ github.event.repository.name }}.tar
+        path: ${{ github.event.repository.name }}.tar

.github/workflows/ccpp_mac_rc.yml

@@ -1,28 +1,32 @@
 name: C/C++ Release candidate macos
 
 on:
-  push:
-    branches:
-      - rc
+  workflow_dispatch:
 
 jobs:
   build:
 
-    runs-on: macos-11
+    runs-on: macos-12
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        ref: 'rc'
+    - uses: actions/checkout@v3
     - name: build deps & slicer
-      run: ./BuildMacOS.sh -i
+      run: ./BuildMacOS.sh
+    - name: copy zstd
+      run: cp /usr/local/opt/zstd/lib/libzstd.1.dylib ./build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app/Contents/MacOS/libzstd.1.dylib
+    - name: relink zstd
+      run: install_name_tool -change /usr/local/opt/zstd/lib/libzstd.1.dylib  @executable_path/libzstd.1.dylib ./build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app/Contents/MacOS/${{ github.event.repository.name }}
+    - name: create the dmg
+      run: |
+        hdiutil create -ov -fs HFS+ -volname ${{ github.event.repository.name }} -srcfolder "build/pack/${{ github.event.repository.name }}" temp.dmg
+        hdiutil convert temp.dmg -format UDZO -o ${{ github.event.repository.name }}.dmg
     - name: Upload artifact
       uses: actions/[email protected]
       with:
-        name: rc_macos.tar
-        path: build/${{ github.event.repository.name }}.tar
+        name: rc_macos.app
+        path: build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app
     - name: Upload artifact
       uses: actions/[email protected]
       with:
         name: rc_macos.dmg
-        path: build/${{ github.event.repository.name }}.dmg
+        path: ${{ github.event.repository.name }}.dmg

.github/workflows/ccpp_ubuntu.yml

@@ -1,12 +1,7 @@
 name: C/C++ Nightly ubuntu
 
 on:
-  push:
-    branches:
-      - Nigthly
-      - nightly_dev
-      - nightly_master
-      - debug_ubuntu
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_ubuntu_debug.yml

@@ -1,9 +1,7 @@
 name: C/C++ debug ubuntu
 
 on:
-  push:
-    branches:
-      - debug_ubuntu
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_ubuntu_gtk3.yml

@@ -1,12 +1,7 @@
 name: C/C++ Nightly ubuntu-GTK3
 
 on:
-  push:
-    branches:
-      - Nigthly
-      - nightly_dev
-      - nightly_master
-      - debug_ubuntu
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_ubuntu_gtk3_debug.yml

@@ -1,9 +1,7 @@
 name: C/C++ debug ubuntu-GTK3
 
 on:
-  push:
-    branches:
-      - debug_ubuntu
+  workflow_dispatch:
 
 jobs:
   build:
@@ -47,4 +45,4 @@ jobs:
       with:
         name: ${{ github.event.repository.name }}-gtk3.AppImage
         path: build/${{ github.event.repository.name }}_ubu64.AppImage
-        
+

.github/workflows/ccpp_ubuntu_gtk3_rc.yml

@@ -1,9 +1,7 @@
 name: C/C++ Release candidate ubuntu-GTK3
 
 on:
-  push:
-    branches:
-      - rc
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_ubuntu_rc.yml

@@ -1,9 +1,7 @@
 name: C/C++ Release candidate ubuntu
 
 on:
-  push:
-    branches:
-      - rc
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_win.yml

@@ -1,11 +1,7 @@
 name: C/C++ Nightly windows x64
 
 on:
-  push:
-    branches:
-      - Nigthly
-      - nightly_dev
-      - nightly_master
+  workflow_dispatch:
 
 jobs:
 

.github/workflows/ccpp_win_debug.yml

@@ -1,9 +1,7 @@
 name: C/C++ debug windows x64
 
 on:
-  push:
-    branches:
-      - debug_win
+  workflow_dispatch:
 
 jobs:
 
@@ -77,7 +75,7 @@ jobs:
   build:
     runs-on: windows-2019
     needs: build_dep
-    
+
     steps:
     - uses: actions/checkout@v1
     - uses: ilammy/msvc-dev-cmd@v1

.github/workflows/ccpp_win_deps.yml

@@ -1,9 +1,8 @@
 name: C/C++ dep build windows x64
 
 on:
-  push:
-    branches:
-      - debug_win
+  workflow_dispatch:
+
 
 jobs:
   build_dep:

.github/workflows/ccpp_win_rc.yml

@@ -1,9 +1,7 @@
 name: C/C++ Release candidate windows x64
 
 on:
-  push:
-    branches:
-      - rc
+  workflow_dispatch:
 
 jobs:
 

BuildLinux.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export ROOT=`pwd`
-export NCORES=`nproc --all`
+export NCORES=`nproc`
 FOUND_GTK2=$(dpkg -l libgtk* | grep gtk2)
 FOUND_GTK3=$(dpkg -l libgtk* | grep gtk-3)
 
@@ -167,16 +167,16 @@ then
         pushd destdir/usr/local/lib
             if [[ -z "$FOUND_GTK3_DEV" ]]
             then
-                cp libwxscintilla-3.1.a libwx_gtk2u_scintilla-3.1.a
+                cp libwxscintilla-3.2.a libwx_gtk2u_scintilla-3.2.a
             else
-                cp libwxscintilla-3.1.a libwx_gtk3u_scintilla-3.1.a
+                cp libwxscintilla-3.2.a libwx_gtk3u_scintilla-3.2.a
             fi
         popd
         echo "done"
 
         # clean deps
-        echo "[6/9] Cleaning dependencies..."
-        rm -rf dep_*
+        #echo "[6/9] Cleaning dependencies..."
+        #rm -rf dep_*
     popd
     echo "done"
 fi