Update actions config

- Fix GitHub action rules
- Disable GitHub actions MacOS build
- Add instalation of dependencies to Linux release action

.github/workflows/deploy-web.yml

@@ -6,7 +6,7 @@ permissions:
 on:
   push:
     branches:
-      - main
+      - master
     # Review gh actions docs if you want to further define triggers, paths, etc
     # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#on
 

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Release
 on:
   push:
     tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - '*'
 
 permissions:
   contents: write
@@ -12,30 +12,35 @@ jobs:
     name: Release
     strategy:
       matrix:
-        kind: ['Linux', 'Windows', 'MacOS']
+        # kind: ['Linux', 'Windows', 'MacOS']
+        kind: ['Linux', 'Windows']
         include:
           - kind: 'Linux'
             os: ubuntu-latest
           - kind: 'Windows'
             os: windows-latest
-          - kind: 'MacOS'
-            os: macos-latest
+          # - kind: 'MacOS'
+          #   os: macos-latest
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          submodules: 'true'
 
       - name: Install Linux dependencies
         if: matrix.kind == 'Linux'
         run: |
-          sudo apt-get install -y build-essential \
+          sudo apt-get install -y build-essential g++-12 libgl-dev libopengl0 libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev
+          sudo rm -f /usr/bin/g++
+          sudo ln /usr/bin/g++-12 /usr/bin/g++
 
       - name: Build and create archive
         shell: bash
         run: |
           cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
-          cmake --build build --config Release
-          Scripts/CreateBundle.sh --postfix ${{ matrix.kind }} Release
+          cmake --build build --config Release --target I3T
+          bash Scripts/CreateBundle.sh --postfix ${{ matrix.kind }} Release
 
       - name: Publish
         uses: softprops/action-gh-release@v1

.gitlab-ci.yml

@@ -86,21 +86,6 @@ test:
 
 ###
 
-release:
-  stage: release
-  only:
-    - master
-  script:
-    - mkdir relase-out && cd release-out
-    - cmake -DCMAKE_BUILD_TYPE=Release ..
-    - cmake --build . -j 8 --target I3T
-    - bash Scripts/CreateBundle.sh
-  artifacts:
-    paths:
-      - I3T*.zip
-  dependencies:
-    - test
-
 pass:
   script:
     - echo "Pipeline passed"

Docs/manual.md

@@ -6,7 +6,7 @@ Introduction and a short program description. A good idea is to read the tutoria
 ![startWindow](./assets/startWindow.png?raw=true) 
 The program starts with a *Start window* that serves as a signpost between selecting ready-made tutorials, opening an existing scene, or starting a new one.
 
-Once selected, it enters the workspace mode, consisting of two main windows. ![i3tscreens](../Data/tutorials/1TUT/i3tscreens.png?raw=true)
+Once selected, it enters the workspace mode, consisting of two main windows. ![i3tscreens](../Data/Tutorials/1TUT/i3tscreens.png?raw=true)
 
 In the *workspace* window, the user prepares individual transformations and models and plugs
 them into the scene graph. The resulting 3D representation of the structure generated

Scripts/CreateBundle.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -ex
 
 FILES="Data Config.json LICENSE.txt"
 
@@ -79,7 +79,7 @@ function process_args() {
 
 function zip_cmd() {
   if [ $IS_UNIX_LIKE = 1 ]; then
-      zip --recurse --junk-paths "$@"
+      zip -r "$@"
   elif [ $IS_WINDOWS = 1 ]; then
       7z a -tzip "$@"
   fi