Skip to content

Commit b9caab8

Browse files
authored
Merge branch 'master' into filesystempath2
2 parents 9a19343 + 6781386 commit b9caab8

240 files changed

Lines changed: 10325 additions & 5655 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.

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ trim_trailing_whitespace = true
1313
charset = utf-8
1414

1515
[*.sh]
16-
indent_style = tab
16+
indent_style = space
1717
indent_size = 4
1818
tab_width = 4
1919
insert_final_newline = true

.gitattributes

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
# This is based on the Github .gitattributes templates
2-
# Set default behaviour, in case users don't have core.autocrlf set.
32
* text=auto
43

5-
# Explicitly declare text files we want to always be normalized and converted
6-
# to native line endings on checkout.
4+
# Explicitly declare text files to normalize
75
*.cpp text
86
*.h text
97
*.mm text
108

11-
# Declare files that will always have CRLF line endings on checkout.
9+
# Files with CRLF line endings for Windows
1210
*.sln text eol=crlf
1311
*.vcxproj* text eol=crlf
1412
.appveyor.yml text eol=crlf
1513
*.bat text eol=crlf
14+
*.props text eol=crlf
15+
*.filters text eol=crlf
1616

17-
# Denote all files that are truly binary and should not be modified.
17+
# Files with LF line endings for Unix-like systems
18+
*.sh text eol=lf
19+
20+
# Binary files (no EOL normalization)
1821
*.png binary
1922
*.jpg binary
2023

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 87 additions & 0 deletions
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 }}

0 commit comments

Comments
 (0)