Merge branch 'master' into rename-getIsEnabled

Author: danoli3

.github/build-android.yml renamed to .github/disabled/build-android.yml

@@ -16,7 +16,7 @@ concurrency:
 
 jobs:
   build-android:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         cfg:
@@ -45,7 +45,5 @@ jobs:
       run: ./scripts/$TARGET/download_libs.sh
     - name: Build
       run: ./scripts/ci/$TARGET/build.sh
-    - name: Upload Libs
-      run: scripts/ci/upload_of_lib.sh;
       env:
         GA_CI_SECRET: ${{ secrets.CI_SECRET }}

.github/disabled/build-linux-arm.yml

@@ -0,0 +1,51 @@
+name: build-linux-arm
+
+# 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/**'
+
+env:
+  ccache: ccache
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-linux-arm-platforms:
+    runs-on: ubuntu-latest
+    strategy:
+        matrix:
+          cfg:
+          - {target: linuxarmv6l, libs: armv6l}
+          - {target: linuxaarch64, libs: aarch64}
+    env:
+     TARGET: ${{matrix.cfg.target}}
+    steps:
+    - name: Cache Packages
+      uses: awalsh128/cache-apt-pkgs-action@latest
+      with:
+        packages: make curl libunwind-dev libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good
+        version: 1.0
+
+    - uses: actions/checkout@v4
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2.12
+      with:
+        # key: ${{ matrix.os }}-${{ matrix.type }}
+        key: ${{ matrix.cfg.target }}
+    - name: Download libs
+      run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
+    - name: Install dependencies
+      run: ./scripts/ci/$TARGET/install.sh;
+    - name: Build
+      run: ./scripts/ci/$TARGET/build.sh;

.github/workflows/build-vs.yml renamed to .github/disabled/build-vs2019.yml

@@ -13,6 +13,9 @@ on:
       - '**/*.md'
       - 'examples/**'
 
+env:
+  ccache: ccache
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -29,7 +32,7 @@ jobs:
       BITS: ${{ matrix.bits }}
     steps:
       - name: Clone repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - uses: msys2/setup-msys2@v2
         with:
           update: true

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

@@ -17,25 +17,26 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  ccache: ccache
+
 jobs:
   build-emscripten:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
         matrix:
           cfg:
           - {target: emscripten}
-    env:
-     TARGET: ${{matrix.cfg.target}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Docker Step
       run:  "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.21 bash"
     - name: Download libs
-      run: ./scripts/$TARGET/download_libs.sh
+      run: ./scripts/${{matrix.cfg.target}}/download_libs.sh
     - name: Install dependencies
-      run: ./scripts/ci/$TARGET/install.sh
+      run: ./scripts/ci/${{matrix.cfg.target}}/install.sh
     - name: Build
-      run: docker exec -i emscripten sh -c "scripts/ci/$TARGET/build.sh";
+      run: docker exec -i emscripten sh -c "scripts/ci/${{matrix.cfg.target}}/build.sh";
     - name: Upload Libs
       run: scripts/ci/upload_of_lib.sh;
       env:

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

@@ -1,6 +1,5 @@
 name: build-ios-tvos
 
-
 # make the action not run on the local repo if the branch is also in a pull request to OF/OF
 on:
   push:
@@ -14,29 +13,36 @@ on:
       - '**/*.md'
       - 'examples/**'
 
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  ccache: ccache
+
 jobs:
-  build-osx:
-    runs-on: macos-12
+  build-ios-tvos:
+    runs-on: macos-13
     strategy:
         matrix:
           cfg:
-          - {target: ios, libs: ios}
-          #- {target: tvos, libs: ios} #broken currently maybe better to just remove
+          - {target: ios, libs: macos}
+          - {target: tvos, libs: macos}
     env:
      TARGET: ${{matrix.cfg.target}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2.13
+      with:
+        key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
+
     - name: Download libs
-      run: ./scripts/${{matrix.cfg.libs}}/download_libs.sh
+      run: ./scripts/macos/download_latest_libs.sh
     - name: install
       run: ./scripts/ci/$TARGET/install.sh
     - name: Build
       run: ./scripts/ci/$TARGET/build.sh;
 
       env:
-        DEVELOPER_DIR: "/Applications/Xcode_13.4.1.app/Contents/Developer"
+        DEVELOPER_DIR: "/Applications/Xcode.app/Contents/Developer"

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

@@ -0,0 +1,63 @@
+name: build-linux64
+
+# 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:
+  build-linux64-platforms:
+    runs-on: ubuntu-latest
+    strategy:
+        matrix:
+          cfg:
+          - {target: linux64, libs: 64gcc6}
+    env:
+     TARGET: ${{matrix.cfg.target}}
+    steps:
+    - name: Remove Old lib-unwind
+      run: if [ "$TARGET" = "linux64" ]; then
+            sudo apt-get remove libunwind-14 -y;
+           fi
+    # - name: Cache Packages
+    #   uses: awalsh128/cache-apt-pkgs-action@latest
+    #   with:
+    #     packages: wget2 make curl libunwind-dev libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good
+    #     version: 1.0
+
+    - uses: actions/checkout@v4
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2.13
+      with:
+        key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
+
+    - name: Download libs
+      run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
+    - name: Install dependencies
+      run: ./scripts/ci/$TARGET/install.sh;
+    - name: Build
+      run: if [ "$TARGET" = "linux64" ]; then
+            scripts/ci/linux64/build.sh;
+            scripts/ci/$TARGET/run_tests.sh;
+           else
+            scripts/ci/$TARGET/build.sh;
+           fi
+    # - name: Upload Libs
+    #   run: scripts/ci/upload_of_lib.sh;
+    #   env:
+    #     GA_CI_SECRET: ${{ secrets.CI_SECRET }}

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

@@ -0,0 +1,56 @@
+name: build-macos
+
+# 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:
+  build-macos:
+    runs-on: macos-14
+    strategy:
+        matrix:
+          cfg:
+          - {target: macos, opt: "xcode"}
+          - {target: macos, opt: "makefiles"}
+    steps:
+    - uses: actions/checkout@v4
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2.13
+      with:
+        # key: ${{ matrix.os }}-${{ matrix.type }}
+        key: ${{ matrix.cfg.target }}-${{ matrix.cfg.opt }}
+        # key: ${{ matrix.msystem }}
+
+    - name: Download libs
+      # continue-on-error: true
+      run: ./scripts/${{ matrix.cfg.target }}/download_latest_libs.sh
+    # this step is not needed here because the script is empty
+    # - name: install
+    # run: ./scripts/ci/$TARGET/install.sh
+
+    - name: Build
+      run:
+        if [ ${{ matrix.cfg.opt }} = "xcode" ]; then
+          scripts/ci/${{ matrix.cfg.target }}/build.sh ${{ matrix.cfg.opt }};
+        else
+          scripts/ci/${{ matrix.cfg.target }}/run_tests.sh;
+        fi
+      env:
+        DEVELOPER_DIR: "/Applications/Xcode.app/Contents/Developer"
+        SDKROOT: "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"

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

@@ -17,6 +17,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  ccache: ccache
+
 jobs:
   build-msys2:
     runs-on: windows-latest
@@ -29,19 +32,36 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2.13
+      with:
+        # key: ${{ matrix.os }}-${{ matrix.type }}
+        key: ${{ matrix.msystem }}
     - uses: msys2/setup-msys2@v2
       with:
-        update: true
+        cache: true
+        release: true
+        update: false
         msystem: ${{matrix.msystem}}
+        pacboy: openssl:p python:p 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: >-
-          git
           unzip
-          rsync
-          wget
+          make
+        # lld
+        # gcc:p gdb:p zlib:p poco:p pkgconf:p harfbuzz:p ntldd-git:p 
+        # boost:p tools:p
+        # install: >-
+        # unzip
+        # git
+        # rsync
+        # wget
+        
     - name: Install dependencies
       run: ./scripts/ci/msys2/install.sh
+
     - name: Build
       run: ./scripts/ci/msys2/build.sh
+
     - name: Run tests
       run: ./scripts/ci/msys2/run_tests.sh