Skip to content

Commit 375fad3

Browse files
artificielartificiel
authored
Merge branch 'openframeworks:master' into ofcolor-vector
2 parents 6105967 + c502a09 commit 375fad3

456 files changed

Lines changed: 20727 additions & 8284 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build-emscripten.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
env:
2828
TARGET: ${{matrix.cfg.target}}
2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3131
- name: Docker Step
3232
run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.21 bash"
3333
- name: Download libs

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
env:
3131
TARGET: ${{matrix.cfg.target}}
3232
steps:
33-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v4
3434
- name: Download libs
3535
run: ./scripts/${{matrix.cfg.libs}}/download_libs.sh
3636
- name: install

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
env:
2929
TARGET: ${{matrix.cfg.target}}
3030
steps:
31-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3232
- name: Download libs
3333
run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
3434
- name: Install dependencies

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
env:
1515
TARGET: ${{matrix.cfg.target}}
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- name: Install libunwind
1919
run: sudo apt-get install libunwind-dev
2020
- name: Install dependencies
@@ -25,7 +25,7 @@ jobs:
2525
run: scripts/ci/package_builds.sh;
2626
id: createpackage
2727
- name: Update Release
28-
uses: IsaacShelton/update-existing-release@v1.3.2
28+
uses: IsaacShelton/update-existing-release@v1.3.3
2929
with:
3030
token: ${{ secrets.GITHUB_TOKEN }}
3131
tag: nightly

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
env:
2929
TARGET: ${{matrix.cfg.target}}
3030
steps:
31-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3232
- name: Download libs
3333
run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
3434
- name: Remove Old lib-unwind

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

Lines changed: 53 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -29,74 +29,71 @@ jobs:
2929
TARGET: ${{matrix.cfg.target}}
3030
OPT: ${{matrix.cfg.opt}}
3131
steps:
32-
- uses: actions/checkout@v3
33-
- name: Cache compile
34-
id: cache-compile
35-
uses: actions/cache@v3
36-
env:
37-
cache-name: cache-keep-compile
38-
with:
39-
path: |
40-
libs/openFrameworksCompiled/lib/osx/*.a
41-
libs/openFrameworksCompiled/lib/osx/**/
42-
addons/obj/osx/**/
43-
scripts/templates/osx/build/**/
44-
45-
key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-${{ hashFiles('**/*.cpp') }}
46-
restore-keys: |
47-
${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-
48-
32+
- uses: actions/checkout@v4
33+
# - name: Cache compile
34+
# id: cache-compile
35+
# uses: actions/cache@v3
36+
# env:
37+
# cache-name: cache-keep-compile
38+
# with:
39+
# path: |
40+
# libs/openFrameworksCompiled/lib/osx/**/
41+
# addons/obj/osx/**/
42+
#
43+
# # key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-${{ hashFiles('**/*.cpp') }}
44+
# key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-
45+
# restore-keys: |
46+
# ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-
4947

50-
- name: Cache libs
51-
id: cache-libs
52-
uses: actions/cache@v3
53-
env:
54-
cache-name: cache-install-libs
55-
with:
56-
path: |
57-
libs/boost/**
58-
libs/cairo/**
59-
libs/curl/**
60-
libs/fmod/**
61-
libs/FreeImage/**
62-
libs/freetype/**
63-
libs/glew/**
64-
libs/glfw/**
65-
libs/glm/**
66-
libs/json/**
67-
libs/pugixml/**
68-
libs/rtAudio/**
69-
libs/tess2/**
70-
libs/uriparser/**
71-
libs/utf8/**
72-
addons/ofxAssimpModelLoader/libs/**/
73-
addons/ofxKinect/libs/**/
74-
addons/ofxOpenCv/libs/**/
75-
addons/ofxSvg/libs/**/
76-
addons/ofxPoco/libs/**/
77-
78-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('scripts/apothecary/apothecary/formulas/**/*.sh') }}
79-
restore-keys: |
80-
${{ runner.os }}-build-${{ env.cache-name }}-
81-
- if: ${{ steps.cache-libs.outputs.cache-hit != 'true' }}
82-
# name: Download libs
48+
# - name: Cache libs
49+
# id: cache-libs
50+
# uses: actions/cache@v3
51+
# env:
52+
# cache-name: cache-install-libs
53+
# with:
54+
# path: |
55+
# libs/boost/**
56+
# libs/cairo/**
57+
# libs/curl/**
58+
# libs/fmod/**
59+
# libs/FreeImage/**
60+
# libs/freetype/**
61+
# libs/glew/**
62+
# libs/glfw/**
63+
# libs/glm/**
64+
# libs/json/**
65+
# libs/pugixml/**
66+
# libs/rtAudio/**
67+
# libs/tess2/**
68+
# libs/uriparser/**
69+
# libs/utf8/**
70+
# addons/ofxAssimpModelLoader/libs/**/
71+
# addons/ofxKinect/libs/**/
72+
# addons/ofxOpenCv/libs/**/
73+
# addons/ofxSvg/libs/**/
74+
# addons/ofxPoco/libs/**/
75+
#
76+
# key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('scripts/apothecary/apothecary/formulas/**/*.sh') }}
77+
# restore-keys: |
78+
# ${{ runner.os }}-build-${{ env.cache-name }}-
79+
# - if: ${{ steps.cache-libs.outputs.cache-hit != 'true' }}
80+
- name: Download libs
8381
# continue-on-error: true
8482
run: ./scripts/$TARGET/download_libs.sh
85-
- name: rm-dev
86-
run: sudo rm -rf /Library/Developer
83+
# - name: rm-dev
84+
# run: sudo rm -rf /Library/Developer
8785

8886
# this step is not needed here because the script is empty
8987
# - name: install
9088
# run: ./scripts/ci/$TARGET/install.sh
9189

9290
- name: Build
9391
run:
94-
if [ "$TARGET" = "osx" ] && [ "$OPT" = "xcode" ]; then
92+
if [ "$OPT" = "xcode" ]; then
9593
scripts/ci/$TARGET/build.sh $OPT;
9694
else
9795
scripts/ci/$TARGET/run_tests.sh;
9896
fi
9997
env:
100-
DEVELOPER_DIR: "/Applications/Xcode_13.4.1.app/Contents/Developer"
101-
SDKROOT: "/Applications/Xcode_13.4.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
102-
98+
DEVELOPER_DIR: "/Applications/Xcode.app/Contents/Developer"
99+
SDKROOT: "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"

‎.github/workflows/build-msys2.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run:
3030
shell: msys2 {0}
3131
steps:
32-
- uses: actions/checkout@v3
32+
- uses: actions/checkout@v4
3333
- uses: msys2/setup-msys2@v2
3434
with:
3535
update: true

‎.github/workflows/build-vs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
BITS: ${{ matrix.bits }}
3030
steps:
3131
- name: Clone repository
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333
- uses: msys2/setup-msys2@v2
3434
with:
3535
update: true

‎.github/workflows/manual-nightly.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
env:
1818
TARGET: ${{matrix.cfg.target}}
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
- name: Install libunwind
2222
run: sudo apt-get install libunwind-dev
2323
- name: Install dependencies
@@ -28,7 +28,7 @@ jobs:
2828
run: scripts/ci/package_builds.sh ${{ github.event.inputs.release }};
2929
id: createpackage
3030
- name: Update Release
31-
uses: IsaacShelton/update-existing-release@v1.3.2
31+
uses: IsaacShelton/update-existing-release@v1.3.3
3232
with:
3333
token: ${{ secrets.GITHUB_TOKEN }}
3434
tag: ${{ github.event.inputs.release }}

‎.github/workflows/manual-web-examples.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: build-web-examples
2+
3+
4+
# make the action not run on the local repo if the branch is also in a pull request to OF/OF
5+
on:
6+
workflow_dispatch:
7+
inputs:
8+
release:
9+
description: 'release'
10+
required: true
11+
default: 'nightly'
12+
#on:
13+
# push:
14+
# if: github.event_name == 'push' && github.event.pull_request == null
15+
# paths-ignore:
16+
# - '**/*.md'
17+
# - 'examples/**'
18+
# pull_request:
19+
# if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks'
20+
# paths-ignore:
21+
# - '**/*.md'
22+
# - 'examples/**'
23+
jobs:
24+
build-web-examples:
25+
runs-on: ubuntu-20.04
26+
strategy:
27+
matrix:
28+
cfg:
29+
- target: emscripten
30+
env:
31+
TARGET: ${{matrix.cfg.target}}
32+
steps:
33+
- uses: actions/checkout@v4
34+
- name: Docker Step
35+
run: docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.21 bash
36+
- name: Download libs
37+
run: ./scripts/$TARGET/download_libs.sh
38+
- name: Install dependencies
39+
run: ./scripts/ci/$TARGET/install_web_examples.sh
40+
- name: Build
41+
run: docker exec -e GA_EXAMPLES_USER=${{ secrets.SSH_USER }} -e GA_EXAMPLES_SERVER=${{ secrets.SSH_SERVER }} -e GA_EXAMPLES_KEY="${{ secrets.SSH_KEY }}" -e GH_HEAD_REF=${{ github.head_ref }} -e GH_BRANCH=${{ github.ref_name }} -e GH_ACTIONS=true -i emscripten sh -c "scripts/ci/$TARGET/examples_to_build.sh"
42+
env:
43+
GA_EXAMPLES_USER: ${{ secrets.SSH_USER }}
44+
GA_EXAMPLES_SERVER: ${{ secrets.SSH_SERVER }}
45+
GA_EXAMPLES_KEY: ${{ secrets.SSH_KEY }}
46+
GH_HEAD_REF: ${{ github.head_ref }}
47+
GH_BRANCH: ${{ github.ref_name }}
48+
GH_ACTIONS: "true"

0 commit comments

Comments
 (0)