Merge branch 'master' of github.com:openframeworks/openFrameworks

Author: ofTheo

.github/workflows/build-emscripten.yml

@@ -27,7 +27,7 @@ jobs:
     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

.github/workflows/build-ios-tvos.yml

@@ -30,7 +30,7 @@ jobs:
     env:
      TARGET: ${{matrix.cfg.target}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Download libs
       run: ./scripts/${{matrix.cfg.libs}}/download_libs.sh
     - name: install

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

@@ -28,7 +28,7 @@ jobs:
     env:
      TARGET: ${{matrix.cfg.target}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Download libs
       run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
     - name: Install dependencies

.github/workflows/build-linux-nightly.yml

@@ -14,7 +14,7 @@ jobs:
     env:
      TARGET: ${{matrix.cfg.target}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install libunwind
       run:  sudo apt-get install libunwind-dev
     - name: Install dependencies
@@ -25,7 +25,7 @@ jobs:
       run: scripts/ci/package_builds.sh;
       id: createpackage
     - name: Update Release
-      uses: IsaacShelton/[email protected].2
+      uses: IsaacShelton/[email protected].3
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         tag: nightly

.github/workflows/build-linux.yml

@@ -28,7 +28,7 @@ jobs:
     env:
      TARGET: ${{matrix.cfg.target}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Download libs
       run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
     - name: Remove Old lib-unwind

.github/workflows/build-macos.yml

@@ -29,20 +29,19 @@ jobs:
       TARGET: ${{matrix.cfg.target}}
       OPT: ${{matrix.cfg.opt}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Cache compile
       id: cache-compile
       uses: actions/cache@v3
       env:
         cache-name: cache-keep-compile
       with:
         path: |
-          libs/openFrameworksCompiled/lib/osx/*.a
           libs/openFrameworksCompiled/lib/osx/**/
           addons/obj/osx/**/
-          scripts/templates/osx/build/**/
 
-        key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-${{ hashFiles('**/*.cpp') }}
+        # key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-${{ hashFiles('**/*.cpp') }}
+        key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-
         restore-keys: |
           ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-
 
@@ -91,7 +90,7 @@ jobs:
 
     - name: Build
       run:
-        if [ "$TARGET" = "osx" ] && [ "$OPT" = "xcode" ]; then
+        if [ "$OPT" = "xcode" ]; then
           scripts/ci/$TARGET/build.sh $OPT;
         else
           scripts/ci/$TARGET/run_tests.sh;

.github/workflows/build-msys2.yml

@@ -29,7 +29,7 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: msys2/setup-msys2@v2
       with:
         update: true

.github/workflows/build-vs.yml

@@ -29,7 +29,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/manual-nightly.yml

@@ -17,7 +17,7 @@ jobs:
     env:
      TARGET: ${{matrix.cfg.target}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install libunwind
       run:  sudo apt-get install libunwind-dev
     - name: Install dependencies
@@ -28,7 +28,7 @@ jobs:
       run: scripts/ci/package_builds.sh ${{ github.event.inputs.release }};
       id: createpackage
     - name: Update Release
-      uses: IsaacShelton/[email protected].2
+      uses: IsaacShelton/[email protected].3
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         tag: ${{ github.event.inputs.release }}

addons/ofxEmscripten/libs/html5audio/lib/emscripten/library_html5audio.js

@@ -97,7 +97,7 @@ var LibraryHTML5Audio = {
                 var fileSizeInBytes = stats.size;
 
                 var tag = ext; //this covers most types
-                if( ext == mp3 ){
+                if( ext == 'mp3'){
                     tag = 'mpeg';
                 }else if( ext == 'oga'){
                     tag = 'ogg';