Skip to content

Commit ebf18a1

Browse files
artificielartificiel
authored
Merge branch 'openframeworks:master' into ofcolor-vector
2 parents 5edd94d + d78075f commit ebf18a1

338 files changed

Lines changed: 9173 additions & 123504 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/build-android.yml renamed to .github/disabled/build-android.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ concurrency:
1616

1717
jobs:
1818
build-android:
19-
runs-on: ubuntu-18.04
19+
runs-on: ubuntu-20.04
2020
strategy:
2121
matrix:
2222
cfg:
@@ -45,7 +45,5 @@ jobs:
4545
run: ./scripts/$TARGET/download_libs.sh
4646
- name: Build
4747
run: ./scripts/ci/$TARGET/build.sh
48-
- name: Upload Libs
49-
run: scripts/ci/upload_of_lib.sh;
5048
env:
5149
GA_CI_SECRET: ${{ secrets.CI_SECRET }}

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

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: build-linux-arm
2+
3+
# make the action not run on the local repo if the branch is also in a pull request to OF/OF
4+
on:
5+
push:
6+
if: github.event_name == 'push' && github.event.pull_request == null
7+
paths-ignore:
8+
- '**/*.md'
9+
- 'examples/**'
10+
pull_request:
11+
if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks'
12+
paths-ignore:
13+
- '**/*.md'
14+
- 'examples/**'
15+
16+
env:
17+
ccache: ccache
18+
19+
concurrency:
20+
group: ${{ github.workflow }}-${{ github.ref }}
21+
cancel-in-progress: true
22+
23+
jobs:
24+
build-linux-arm-platforms:
25+
runs-on: ubuntu-latest
26+
strategy:
27+
matrix:
28+
cfg:
29+
- {target: linuxarmv6l, libs: armv6l}
30+
- {target: linuxaarch64, libs: aarch64}
31+
env:
32+
TARGET: ${{matrix.cfg.target}}
33+
steps:
34+
- name: Cache Packages
35+
uses: awalsh128/cache-apt-pkgs-action@latest
36+
with:
37+
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
38+
version: 1.0
39+
40+
- uses: actions/checkout@v4
41+
- name: ccache
42+
uses: hendrikmuhs/ccache-action@v1.2.12
43+
with:
44+
# key: ${{ matrix.os }}-${{ matrix.type }}
45+
key: ${{ matrix.cfg.target }}
46+
- name: Download libs
47+
run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
48+
- name: Install dependencies
49+
run: ./scripts/ci/$TARGET/install.sh;
50+
- name: Build
51+
run: ./scripts/ci/$TARGET/build.sh;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ on:
1313
- '**/*.md'
1414
- 'examples/**'
1515

16+
env:
17+
ccache: ccache
18+
1619
concurrency:
1720
group: ${{ github.workflow }}-${{ github.ref }}
1821
cancel-in-progress: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ concurrency:
1919

2020
jobs:
2121
build-emscripten:
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-latest
2323
strategy:
2424
matrix:
2525
cfg:

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: build-ios-tvos
22

3-
43
# make the action not run on the local repo if the branch is also in a pull request to OF/OF
54
on:
65
push:
@@ -14,13 +13,15 @@ on:
1413
- '**/*.md'
1514
- 'examples/**'
1615

16+
env:
17+
ccache: ccache
1718

1819
concurrency:
1920
group: ${{ github.workflow }}-${{ github.ref }}
2021
cancel-in-progress: true
2122

2223
jobs:
23-
build-osx:
24+
build-ios-tvos:
2425
runs-on: macos-12
2526
strategy:
2627
matrix:
@@ -31,6 +32,11 @@ jobs:
3132
TARGET: ${{matrix.cfg.target}}
3233
steps:
3334
- uses: actions/checkout@v4
35+
- name: ccache
36+
uses: hendrikmuhs/ccache-action@v1.2.12
37+
with:
38+
key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
39+
3440
- name: Download libs
3541
run: ./scripts/${{matrix.cfg.libs}}/download_libs.sh
3642
- name: install

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

Lines changed: 0 additions & 37 deletions
This file was deleted.

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

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ on:
1313
- '**/*.md'
1414
- 'examples/**'
1515

16-
16+
env:
17+
ccache: ccache
18+
1719
concurrency:
1820
group: ${{ github.workflow }}-${{ github.ref }}
1921
cancel-in-progress: true
2022

2123
jobs:
22-
build-linux-platforms:
24+
build-linux64-platforms:
2325
runs-on: ubuntu-latest
2426
strategy:
2527
matrix:
@@ -28,24 +30,35 @@ jobs:
2830
env:
2931
TARGET: ${{matrix.cfg.target}}
3032
steps:
31-
- uses: actions/checkout@v4
32-
- name: Download libs
33-
run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
3433
- name: Remove Old lib-unwind
3534
run: if [ "$TARGET" = "linux64" ]; then
3635
sudo apt-get remove libunwind-14 -y;
3736
fi
37+
- name: Cache Packages
38+
uses: awalsh128/cache-apt-pkgs-action@latest
39+
with:
40+
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
41+
version: 1.0
42+
43+
- uses: actions/checkout@v4
44+
- name: ccache
45+
uses: hendrikmuhs/ccache-action@v1.2.12
46+
with:
47+
key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
48+
49+
- name: Download libs
50+
run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
3851
- name: Install dependencies
3952
run: ./scripts/ci/$TARGET/install.sh;
4053
- name: Build
4154
run: if [ "$TARGET" = "linux64" ]; then
42-
scripts/ci/$TARGET/build.sh;
55+
scripts/ci/linux64/build.sh;
4356
scripts/ci/$TARGET/run_tests.sh;
4457
else
4558
scripts/ci/$TARGET/build.sh;
4659
fi
47-
- name: Upload Libs
48-
run: scripts/ci/upload_of_lib.sh;
49-
env:
50-
GA_CI_SECRET: ${{ secrets.CI_SECRET }}
60+
# - name: Upload Libs
61+
# run: scripts/ci/upload_of_lib.sh;
62+
# env:
63+
# GA_CI_SECRET: ${{ secrets.CI_SECRET }}
5164

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

Lines changed: 16 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -13,73 +13,34 @@ on:
1313
- '**/*.md'
1414
- 'examples/**'
1515

16+
env:
17+
ccache: ccache
18+
1619
concurrency:
1720
group: ${{ github.workflow }}-${{ github.ref }}
1821
cancel-in-progress: true
1922

2023
jobs:
21-
build-osx:
22-
runs-on: macos-12
24+
build-macos:
25+
runs-on: macos-13
2326
strategy:
2427
matrix:
2528
cfg:
2629
- {target: osx, opt: "xcode"}
2730
- {target: osx, opt: "makefiles"}
28-
env:
29-
TARGET: ${{matrix.cfg.target}}
30-
OPT: ${{matrix.cfg.opt}}
3131
steps:
3232
- 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 }}-
33+
- name: ccache
34+
uses: hendrikmuhs/ccache-action@v1.2.12
35+
with:
36+
# key: ${{ matrix.os }}-${{ matrix.type }}
37+
key: ${{ matrix.cfg.target }}-${{ matrix.cfg.opt }}
38+
# key: ${{ matrix.msystem }}
39+
4740

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' }}
8041
- name: Download libs
8142
# continue-on-error: true
82-
run: ./scripts/$TARGET/download_libs.sh
43+
run: ./scripts/${{ matrix.cfg.target }}/download_libs.sh
8344
# - name: rm-dev
8445
# run: sudo rm -rf /Library/Developer
8546

@@ -89,10 +50,10 @@ jobs:
8950

9051
- name: Build
9152
run:
92-
if [ "$OPT" = "xcode" ]; then
93-
scripts/ci/$TARGET/build.sh $OPT;
53+
if [ ${{ matrix.cfg.opt }} = "xcode" ]; then
54+
scripts/ci/${{ matrix.cfg.target }}/build.sh ${{ matrix.cfg.opt }};
9455
else
95-
scripts/ci/$TARGET/run_tests.sh;
56+
scripts/ci/${{ matrix.cfg.target }}/run_tests.sh;
9657
fi
9758
env:
9859
DEVELOPER_DIR: "/Applications/Xcode.app/Contents/Developer"

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

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ on:
1313
- '**/*.md'
1414
- 'examples/**'
1515

16+
env:
17+
ccache: ccache
18+
1619
concurrency:
1720
group: ${{ github.workflow }}-${{ github.ref }}
1821
cancel-in-progress: true
@@ -30,18 +33,30 @@ jobs:
3033
shell: msys2 {0}
3134
steps:
3235
- uses: actions/checkout@v4
36+
- name: ccache
37+
uses: hendrikmuhs/ccache-action@v1.2.12
38+
with:
39+
# key: ${{ matrix.os }}-${{ matrix.type }}
40+
key: ${{ matrix.msystem }}
3341
- uses: msys2/setup-msys2@v2
3442
with:
35-
update: true
43+
cache: true
44+
update: false
3645
msystem: ${{matrix.msystem}}
37-
install: >-
38-
git
39-
unzip
40-
rsync
41-
wget
46+
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
47+
# boost:p tools:p
48+
# install: >-
49+
# unzip
50+
# git
51+
# rsync
52+
# wget
53+
4254
- name: Install dependencies
4355
run: ./scripts/ci/msys2/install.sh
56+
4457
- name: Build
4558
run: ./scripts/ci/msys2/build.sh
59+
4660
- name: Run tests
4761
run: ./scripts/ci/msys2/run_tests.sh
62+

0 commit comments

Comments
 (0)