Merge branch 'master' into ofTrueTypeFont--constructor+misc

Author: artificiel

.github/workflows/build-emscripten.yml renamed to .github/workflows/actions/build-emscripten.yml

@@ -17,9 +17,12 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  ccache: ccache
+
 jobs:
   build-emscripten:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
         matrix:
           cfg:

.github/workflows/build-ios-tvos.yml renamed to .github/workflows/actions/build-ios-tvos.yml

@@ -13,13 +13,13 @@ on:
       - '**/*.md'
       - 'examples/**'
 
-env:
-  ccache: ccache
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  ccache: ccache
+
 jobs:
   build-ios-tvos:
     runs-on: macos-13

.github/workflows/build-linux64.yml renamed to .github/workflows/actions/build-linux64.yml

@@ -13,16 +13,16 @@ on:
       - '**/*.md'
       - 'examples/**'
 
-env:
-  ccache: ccache
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  ccache: ccache  
+
 jobs:
   build-linux64-platforms:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
         matrix:
           cfg:
@@ -61,4 +61,3 @@ jobs:
     #   run: scripts/ci/upload_of_lib.sh;
     #   env:
     #     GA_CI_SECRET: ${{ secrets.CI_SECRET }}
-

.github/workflows/build-macos.yml renamed to .github/workflows/actions/build-macos.yml

@@ -13,13 +13,13 @@ on:
       - '**/*.md'
       - 'examples/**'
 
-env:
-  ccache: ccache
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  ccache: ccache
+
 jobs:
   build-macos:
     runs-on: macos-13

.github/workflows/build-msys2.yml renamed to .github/workflows/actions/build-msys2.yml

@@ -13,13 +13,13 @@ on:
       - '**/*.md'
       - 'examples/**'
 
-env:
-  ccache: ccache
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  ccache: ccache
+
 jobs:
   build-msys2:
     runs-on: windows-latest
@@ -41,9 +41,14 @@ jobs:
     - uses: msys2/setup-msys2@v2
       with:
         cache: true
+        release: true
         update: false
         msystem: ${{matrix.msystem}}
-        pacboy: assimp:p cairo:p curl:p freeglut:p FreeImage:p gcc:p gdb:p glew:p glfw:p glm:p harfbuzz:p libsndfile:p libusb:p libxml2:p mpg123:p nlohmann-json:p ntldd-git:p openal:p opencv:p pkgconf:p pugixml:p rtaudio:p uriparser:p utf8cpp:p zlib:p poco:p
+        pacboy: gcc:p assimp:p cairo:p curl:p freeglut:p FreeImage:p glew:p glfw:p glm:p libsndfile:p libusb:p libxml2:p mpg123:p nlohmann-json:p openal:p opencv:p pugixml:p rtaudio:p uriparser:p utf8cpp:p
+        install: >-
+          unzip
+          make
+        # gcc:p gdb:p zlib:p poco:p pkgconf:p harfbuzz:p ntldd-git:p 
         # boost:p tools:p
         # install: >-
         # unzip
@@ -59,4 +64,3 @@ jobs:
 
     - name: Run tests
       run: ./scripts/ci/msys2/run_tests.sh
-

.github/workflows/actions/build-rpi.yml

@@ -0,0 +1,54 @@
+name: build-rpi
+
+# make the action not run on the local repo if the branch is also in a pull request to OF/OF
+on:
+  push:
+    if: github.event_name == 'push' && github.event.pull_request == null
+    paths-ignore:
+    - '**/*.md'
+    - 'examples/**'
+  pull_request:
+    if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks'
+    paths-ignore:
+      - '**/*.md'
+      - 'examples/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  ccache: ccache
+
+jobs:
+  rpi-build:
+    runs-on: ubuntu-24.04
+    strategy:
+        matrix:
+          cfg:
+          - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 1 }
+          - { libs: aarch64,  multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 1 }
+    env:
+     ARCH: ${{matrix.cfg.libs}}
+     MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}}
+     ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}}
+    steps:
+    - name: Cache Packages
+      uses: awalsh128/cache-apt-pkgs-action@latest
+      with:
+        packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}}
+        version: 1.0
+
+    - uses: actions/checkout@v4
+
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2.12
+      with:
+        key: ${{ matrix.cfg.libs }}
+
+    - name: Download libs
+      run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
+    - name: Install dependencies
+      run: ./scripts/ci/linuxrpi/install.sh;
+    - name: Build
+      run: ./scripts/ci/linuxrpi/build.sh;

.github/workflows/build-vs2022.yml renamed to .github/workflows/actions/build-vs2022.yml

@@ -17,6 +17,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+# env:
+#   ccache: ccache
+
 jobs:
   build-vs2022:
     runs-on: windows-2022
@@ -58,4 +61,3 @@ jobs:
         working-directory: ${{env.GITHUB_WORKSPACE}}
         run:
           msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
-

.github/workflows/all.py

@@ -0,0 +1,35 @@
+#!/usr/bin/python3
+import glob
+
+lista = glob.glob('actions/*.yml')
+print(lista)
+contagem = 0
+alllines = ''
+lines = []
+first = True
+for a in lista:
+    print(a)
+    f = open(a,'r')
+    # alllines += (f.read() + '\n\n\n\n')
+
+
+    if first:
+        first = False
+        lines += 'name: OF'
+        lines += ''
+        lines += f.readlines()[1:]
+    else:
+        lines += f.readlines()[23:]
+    # lines.append(f.readlines()[2:])
+    lines += '\n\n'
+    lines += '# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \n\n'
+    # lines.append('\n\n\n\n')
+    f.close() 
+
+all = open('of.yml','w')
+# all.write(alllines)
+print(lines)
+all.writelines(lines)
+all.close()
+
+print (alllines)