Skip to content

Commit f57ec48

Browse files
dimitredimitre
committed
merge master
2 parents 4175749 + cd9e9cf commit f57ec48

File tree

110 files changed

+2514
-1323
lines changed

Some content is hidden

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

110 files changed

+2514
-1323
lines changed

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

‎.github/workflows/actions/build-rpi.yml renamed to ‎.github/disabled/build-rpi.yml

File renamed without changes.

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

File renamed without changes.

‎.github/disabled/manual-nightly.yml

+87
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
name: manual-nightly
2+
3+
# on:
4+
# workflow_dispatch:
5+
# inputs:
6+
# release:
7+
# description: 'release'
8+
# required: true
9+
# default: 'nightly'
10+
on:
11+
push:
12+
paths-ignore:
13+
- '**/README.md'
14+
pull_request:
15+
paths-ignore:
16+
- '**/README.md'
17+
18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: true
21+
22+
env:
23+
ccache: ccache
24+
25+
jobs:
26+
manual-nightly:
27+
runs-on: ubuntu-24.04
28+
# runs release manually for a TAG
29+
if: github.repository == 'openframeworks/openframeworks' && startsWith(github.ref, 'refs/tags/')
30+
strategy:
31+
matrix:
32+
cfg:
33+
- {target: linux64, libs: 64gcc6}
34+
steps:
35+
- name: Determine Release
36+
id: vars
37+
shell: bash
38+
run: |
39+
if [[ "${{ github.ref }}" == refs/tags/* ]]; then
40+
echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
41+
elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
42+
echo "RELEASE=nightly" >> $GITHUB_ENV
43+
elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
44+
echo "RELEASE=latest" >> $GITHUB_ENV
45+
else
46+
echo "RELEASE=latest" >> $GITHUB_ENV
47+
fi
48+
- name: Install libunwind
49+
run: sudo apt-get install libunwind-dev
50+
- name: Cache Packages
51+
uses: awalsh128/cache-apt-pkgs-action@latest
52+
with:
53+
packages: aptitude aptitude-common libboost-iostreams1.83.0 libcwidget4 libsigc++-2.0-0v5 libxapian30 fonts-wine{a} libasound2-plugins{a} libcapi20-3t64{a} libosmesa6{a} libpcsclite1{a} libspeexdsp1{a} libwine{a} libxkbregistry0{a} libz-mingw-w64{a} wine{a} wine64 make curl 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
54+
# libunwind-dev wget2
55+
version: 1.0
56+
57+
- uses: actions/checkout@v4
58+
- name: ccache
59+
uses: hendrikmuhs/ccache-action@v1.2.14
60+
with:
61+
key: ${{ matrix.cfg.target }}
62+
- name: update submodules
63+
run: ./scripts/dev/init_submodules.sh
64+
- name: Install dependencies
65+
run: ./scripts/ci/${{matrix.cfg.target}}/install.sh;
66+
- name: Download libs
67+
run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
68+
- name: Create Package
69+
run: scripts/ci/package_builds.sh ${{ github.event.inputs.release }};
70+
id: createpackage
71+
- name: List output directory
72+
run: ls -lah out/
73+
- name: Test Artefact zip
74+
run: |
75+
tar -cjf out/manual-mega_artefact.tar.bz2 -C out $(echo ${{ steps.createpackage.outputs.FILES_OUT }} | tr ' ' '\n' | sed 's|^out/||')
76+
- name: Upload binaries as Artefact
77+
uses: actions/upload-artifact@v4
78+
with:
79+
name: openFrameworks-all-artefact-${{ env.TARGET }}
80+
path: out/manual-mega_artefact.tar.bz2
81+
retention-days: 1
82+
- name: Update Release arm64
83+
uses: softprops/action-gh-release@v2.1.0
84+
with:
85+
token: ${{ secrets.GITHUB_TOKEN }}
86+
tag_name: ${{ env.RELEASE }}
87+
files: ${{ steps.createpackage.outputs.FILES_OUT }}

‎.github/disabled/nightly-linux64.yml

+98
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
name: nightly-linux64
2+
# on:
3+
# push:
4+
# paths-ignore:
5+
# - '**/README.md'
6+
# pull_request:
7+
# paths-ignore:
8+
# - '**/README.md'
9+
# on:
10+
# workflow_dispatch:
11+
# inputs:
12+
# release:
13+
# description: 'release'
14+
# required: true
15+
# default: 'nightly'
16+
# concurrency:
17+
# group: ${{ github.workflow }}-${{ github.ref }}
18+
# cancel-in-progress: true
19+
20+
# on:
21+
# schedule:
22+
# - cron: "0 6 * * *"
23+
24+
on:
25+
schedule:
26+
- cron: "0 6 * * *"
27+
workflow_dispatch:
28+
inputs:
29+
release:
30+
description: 'release'
31+
required: true
32+
default: 'nightly'
33+
env:
34+
ccache: ccache
35+
36+
jobs:
37+
build-nightly:
38+
runs-on: ubuntu-24.04
39+
if: github.repository == 'openframeworks/openframeworks' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
40+
strategy:
41+
matrix:
42+
cfg:
43+
- {target: linux64, libs: 64gcc6}
44+
env:
45+
TARGET: ${{matrix.cfg.target}}
46+
steps:
47+
- name: Determine Release
48+
id: vars
49+
shell: bash
50+
run: |
51+
if [[ "${{ github.ref }}" == refs/tags/* ]]; then
52+
echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
53+
elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
54+
echo "RELEASE=nightly" >> $GITHUB_ENV
55+
elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
56+
echo "RELEASE=latest" >> $GITHUB_ENV
57+
else
58+
echo "RELEASE=latest" >> $GITHUB_ENV
59+
fi
60+
- name: Install libunwind
61+
run: sudo apt-get install libunwind-dev
62+
- name: Cache Packages
63+
uses: awalsh128/cache-apt-pkgs-action@latest
64+
with:
65+
packages: aptitude aptitude-common libboost-iostreams1.83.0 libcwidget4 libsigc++-2.0-0v5 libxapian30 fonts-wine{a} libasound2-plugins{a} libcapi20-3t64{a} libosmesa6{a} libpcsclite1{a} libspeexdsp1{a} libwine{a} libxkbregistry0{a} libz-mingw-w64{a} wine{a} wine64 make curl 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
66+
# libunwind-dev wget2
67+
version: 1.0
68+
- uses: actions/checkout@v4
69+
- name: ccache
70+
uses: hendrikmuhs/ccache-action@v1.2.14
71+
with:
72+
key: ${{ matrix.cfg.target }}
73+
- name: Install dependencies
74+
run: ./scripts/ci/$TARGET/install.sh;
75+
- name: update submodules
76+
run: ./scripts/dev/init_submodules.sh
77+
- name: Download libs
78+
run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
79+
- name: Create Package
80+
run: scripts/ci/package_builds.sh ${{ github.event.inputs.release }};
81+
id: createpackage
82+
- name: List output directory
83+
run: ls -lah out/
84+
- name: Upload GitHub Artefact zip
85+
run: |
86+
tar -cjf out/manual-mega_artefact.tar.bz2 -C out $(echo ${{ steps.createpackage.outputs.FILES_OUT }} | tr ' ' '\n' | sed 's|^out/||')
87+
- name: Upload binaries as Artefact
88+
uses: actions/upload-artifact@v4
89+
with:
90+
name: openFrameworks-all-artefact-${{ env.TARGET }}-${{ env.RELEASE }}
91+
path: out/nightly-mega_artefact.tar.bz2
92+
retention-days: 7
93+
- name: Update Release arm64
94+
uses: softprops/action-gh-release@v2.1.0
95+
with:
96+
token: ${{ secrets.GITHUB_TOKEN }}
97+
tag_name: ${{ env.RELEASE }}
98+
files: ${{ steps.createpackage.outputs.FILES_OUT }}

‎.github/workflows/manual-nightly.yml

+56-59
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,74 @@
1-
name: manual-nightly
1+
# This one was created to make it work whil
22

3-
on:
3+
name: manual-nightly-ok
4+
5+
on:
46
workflow_dispatch:
57
inputs:
6-
release:
7-
description: 'release'
8-
required: true
9-
default: 'nightly'
10-
# on:
11-
# push:
12-
# paths-ignore:
13-
# - '**/README.md'
14-
# pull_request:
15-
# paths-ignore:
16-
# - '**/README.md'
8+
release:
9+
description: "release"
10+
required: true
11+
default: "latest"
1712

1813
concurrency:
1914
group: ${{ github.workflow }}-${{ github.ref }}
2015
cancel-in-progress: true
2116

2217
env:
2318
ccache: ccache
19+
RELEASE: ${{ github.event.inputs.release }}
2420

2521
jobs:
2622
manual-nightly:
2723
runs-on: ubuntu-24.04
2824
if: github.repository == 'openframeworks/openFrameworks' && github.ref == 'refs/heads/master'
2925
strategy:
30-
matrix:
31-
cfg:
32-
- {target: linux64, libs: 64gcc6}
26+
matrix:
27+
cfg:
28+
- { target: linux64, libs: 64gcc6 }
3329
steps:
34-
- name: Install libunwind
35-
run: sudo apt-get install libunwind-dev
36-
- name: Cache Packages
37-
uses: awalsh128/cache-apt-pkgs-action@latest
38-
with:
39-
packages: aptitude aptitude-common libboost-iostreams1.83.0 libcwidget4 libsigc++-2.0-0v5 libxapian30 fonts-wine{a} libasound2-plugins{a} libcapi20-3t64{a} libosmesa6{a} libpcsclite1{a} libspeexdsp1{a} libwine{a} libxkbregistry0{a} libz-mingw-w64{a} wine{a} wine64 make curl 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
40-
# libunwind-dev wget2
41-
version: 1.0
30+
- name: Install libunwind
31+
run: sudo apt-get install libunwind-dev
32+
- name: Cache Packages
33+
uses: awalsh128/cache-apt-pkgs-action@latest
34+
with:
35+
packages: aptitude aptitude-common libboost-iostreams1.83.0 libcwidget4 libsigc++-2.0-0v5 libxapian30 fonts-wine{a} libasound2-plugins{a} libcapi20-3t64{a} libosmesa6{a} libpcsclite1{a} libspeexdsp1{a} libwine{a} libxkbregistry0{a} libz-mingw-w64{a} wine{a} wine64 make curl 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
36+
# libunwind-dev wget2
37+
version: 1.0
4238

43-
- uses: actions/checkout@v4
44-
- name: ccache
45-
uses: hendrikmuhs/ccache-action@v1.2.14
46-
with:
47-
key: ${{ matrix.cfg.target }}
48-
- name: update submodules
49-
run: ./scripts/dev/init_submodules.sh
50-
- name: Install dependencies
51-
run: ./scripts/ci/${{matrix.cfg.target}}/install.sh;
52-
- name: Download libs
53-
run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
54-
- name: Create Package
55-
run: scripts/ci/package_builds.sh ${{ github.event.inputs.release }};
56-
id: createpackage
57-
- name: List output directory
58-
run: ls -lah out/
59-
# - name: Test Artefact zip
60-
# run: |
61-
# tar -cjf out/manual-mega_artefact.tar.bz2 -C out $(echo ${{ steps.createpackage.outputs.FILES_OUT }} | tr ' ' '\n' | sed 's|^out/||')
62-
# - name: Upload binaries as Artefact
63-
# uses: actions/upload-artifact@v4
64-
# with:
65-
# name: openFrameworks-all-artefact-${{ env.TARGET }}-${{ matrix.bundle }}
66-
# path: out/manual-mega_artefact.tar.bz2
67-
# retention-days: 1
68-
- name: Update Release
69-
uses: IsaacShelton/update-existing-release@v1.3.4
70-
if: github.repository == 'openframeworks/openFrameworks' && github.ref == 'refs/heads/master'
71-
with:
72-
token: ${{ secrets.GITHUB_TOKEN }}
73-
tag: ${{ github.event.inputs.release }}
74-
release: ${{ github.event.inputs.release }}
75-
prerelease: false
76-
replace: true
77-
files: ${{ steps.createpackage.outputs.FILES_OUT }}
39+
- uses: actions/checkout@v4
40+
- name: ccache
41+
uses: hendrikmuhs/ccache-action@v1.2.14
42+
with:
43+
key: ${{ matrix.cfg.target }}
44+
- name: update submodules
45+
run: ./scripts/dev/init_submodules.sh
46+
- name: Install dependencies
47+
run: ./scripts/ci/${{matrix.cfg.target}}/install.sh;
48+
- name: Download libs
49+
run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
50+
- name: Create Package
51+
run: scripts/ci/package_builds.sh ${{ github.event.inputs.release }};
52+
id: createpackage
53+
- name: List output directory
54+
run: ls -lah out/
55+
# - name: Test Artefact zip
56+
# run: |
57+
# tar -cjf out/manual-mega_artefact.tar.bz2 -C out $(echo ${{ steps.createpackage.outputs.FILES_OUT }} | tr ' ' '\n' | sed 's|^out/||')
58+
# - name: Upload binaries as Artefact
59+
# uses: actions/upload-artifact@v4
60+
# with:
61+
# name: openFrameworks-all-artefact-${{ env.TARGET }}-${{ matrix.bundle }}
62+
# path: out/manual-mega_artefact.tar.bz2
63+
# retention-days: 1
64+
- name: Update Release
65+
uses: IsaacShelton/update-existing-release@v1.3.4
66+
if: github.repository == 'openframeworks/openFrameworks' && github.ref == 'refs/heads/master'
67+
with:
68+
token: ${{ secrets.GITHUB_TOKEN }}
69+
tag: ${{ github.event.inputs.release }}
70+
# release: ${{ github.event.inputs.release }}
71+
release: nightly
72+
prerelease: false
73+
replace: true
74+
files: ${{ steps.createpackage.outputs.FILES_OUT }}

0 commit comments

Comments
 (0)