Skip to content

Commit 245a60c

Browse files
authored
Linux64 (#468)
* linux fix build targets * Raspberry Pi 64 - GCC 14.2.0 - Bookworm * Fix download * linux calculate - remove rtAudio * Update toolchain * linux arch * Cross Compilers Linux Raspberry Pi 1 / Zero (armv6), Pi 3A, 3B, 4, Pi 5 (armv7) Tests for armv6/armv7 enabled * Fix linuxv7 deploy cross compiler * Fix install scripts * Fix install * Cross compiler install extract * fix install * Install and build * Executable * Cross compiling - Configure and set toolchain linked * linux / linux raspberry pi - fmt, libxml2, rtAudio, tess2, zlib * Configure LD path * Linux cross compiler tess2/zlib setup * Cross compiler configuration and debug echo * Cross compiler fix LD * Cross compiler LD flags * GLEW VS arm64/arm64ec fixes exe flags * Glew * Glew linux * Cross configure * Cross * Cross compiler * Linux arm toolchains * Fix backslash in paths * Toolchain root * Toolchain configure * Toolchain fixes * Toolchain formatting * Toolchain update * Toolchain fixes and symlinks for install * GCC prefix * Symlink * rpath * Toolchain fix LD * crt plz * Sysroot * Symlink * link * Toolchain and raspberry pi image * Actions fix Distribution * Raspberry Pi rootfs create fix * Raspbian rootfs download then mount * xz-utils * Fix rootfs * Linux GCC8 * Cleanup toolchains of old * Linux Wayland fix GLFW. toolchains updated - rpi added android toolchain. added linux64 toolchain 64 * GLFW fix * GLFW fix - build id 2 * Linux GCC 14. Linux Arm upload action fixed to latest * Fix Github Action * gcc15 from source * Linux64 test * Linux gcc * Linux rootfs fixes * Actions Checkout v2 -> 4.2.2 * Remove fmod calculate * Linux toolchain pass GCC to apothecary * Actions Update * Linux add GCC_VERSION * Linux * Toolchain Linux Fixes * Workflow Optimisations allow disable ENV * Test disable tvOS * Actions disable with if rather than seperate instance of ubuntu * Linux Toolchain fixes * Test Quick Disable * Fix Actions * Workflow * Exit if disabled * linux missing libc * Linux * Arm fixes * Toolchains * Toolchain fix * Chians * Toolchains * Linux sysroot issues * Omg kyle * GLFW fix linux * FMT * Parallel enabled -j cmake * Fix unfinished ssh * Make file fixes * zlib depend * Fix libxml2 depend * LibXML2 defines * libxml2 * Parellel make use nproc is not set libxml2 install opengl install setup for linux * case sensetive fix * rtAudio linux * rtAudio clean * rtaudio shared to static * Linux GCC 6 disabled Added Build Script linux Fix toolchain ripi linux * Enable All workflows * Cross Compiler Setup script ez * Test msys2 * Shell on windows fix * svgtiny fix * toolchain linux rpi remove clang * tiny if * Fix linked libraries extra j * Fix depends * svgtiny * svgtiny * Rasbian fixes toolchain pass env if not found * no ccache * fix svgtiny * Fix linux64 * svg * svg * Fix linux64 calculate * linux arm64 cross compiler * missing libxrandr-dev for glfw * Linux * fix zlib * Linux build type rework. Github actions linked to Linux$TYPE now split to using ARCH Configure scripts moved and relinked * Fix apothecary * Build script fix * Fix apothecary * On Target * Jetson cross compiler * Linux fix abi * Fix brotli target * fix brotli * Linux GCC9 / GCC10 enabled * fix gcc not being a number in variable * GCC9 * Fix chmod issues scripts - Add linux cross compiler action for arm64 and jetson * zlib linux fix * Chmod fixing sh * apothecary chmod * zlib * glfw fix * libxml2 linux * Kiss * Linux default sysroot/toolchain / * libxml2 fix copy * Linux Toolchain cross compiler fixes * Kiss kiss * Kiss fix cflags linux * kiss linux * kiss linux line spacing * kiss * libxml2 copy include * svgting * workflow disable test * svgtiny * tess2 fix * fix setup linux * glfw depends * glfw * linux glfw libxcursor-dev * setting up this setup package to work on clean ubuntu * CPP defaults set for GCC versions * brotli fix - configure scripts update * Artifact Cleanups * cross compiler fix * workflows enabled
1 parent effcdb7 commit 245a60c

File tree

115 files changed

+3156
-2226
lines changed

Some content is hidden

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

115 files changed

+3156
-2226
lines changed

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

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

.github/disabled/build-linux64.yml

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

.github/workflows/.DS_Store

-6 KB
Binary file not shown.

.github/workflows/build-emscripten.yml

Lines changed: 43 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ concurrency:
1414

1515
env:
1616
TARGET: "emscripten"
17-
EMSDK_VERSION: "3.1.73"
17+
EMSDK_VERSION: "3.1.74"
1818
USE_ARTIFACT: true
19+
DISABLE_WORKFLOW: "false"
1920

2021
jobs:
2122
build-emscripten:
@@ -25,7 +26,13 @@ jobs:
2526
ARCH: [32, 64]
2627
PTHREADS: [0, 1]
2728
steps:
28-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v4.2.2
30+
- name: Check if Workflow is disabled
31+
run: |
32+
if [ "${{ env.DISABLE_WORKFLOW }}" == "true" ]; then
33+
echo "Workflow is disabled. Exiting."
34+
exit 1
35+
fi
2936
- name: Docker Step
3037
run: docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:${{ env.EMSDK_VERSION }} bash
3138
- name: Scripts Calc Formula
@@ -42,6 +49,8 @@ jobs:
4249
echo "RELEASE=nightly" >> $GITHUB_ENV
4350
elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
4451
echo "RELEASE=latest" >> $GITHUB_ENV
52+
else
53+
echo "RELEASE=latest" >> $GITHUB_ENV
4554
fi
4655
- name: Download previous artifacts
4756
uses: actions/github-script@v7
@@ -142,7 +151,8 @@ jobs:
142151
ARCH: ${{ matrix.ARCH }}
143152
PTHREADS_ENABLED: ${{ matrix.PTHREADS }}
144153

145-
- name: Package
154+
155+
- name: Package Binaries for Artifact
146156
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding' || contains(github.ref, 'refs/tags/'))
147157
working-directory: ${{ env.GITHUB_WORKSPACE }}
148158
run: |
@@ -156,11 +166,9 @@ jobs:
156166
fi
157167
FILENAME="openFrameworksLibs_${{ env.RELEASE }}_emscripten${ARCH_SUFFIX}${PTHREADS_SUFFIX}.tar.bz2"
158168
echo "FILENAME=$FILENAME" >> $GITHUB_ENV
159-
scripts/package.sh
169+
scripts/artifact/artifact.sh
160170
env:
161-
GA_CI_SECRET: ${{ secrets.CI_SECRET }}
162-
ARCH: ${{ matrix.ARCH }}
163-
PTHREADS_ENABLED: ${{ matrix.PTHREADS }}
171+
BUNDLE: ${{ matrix.bundle }}
164172

165173
- name: Upload Artifact
166174
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding' || contains(github.ref, 'refs/tags/'))
@@ -170,6 +178,34 @@ jobs:
170178
path: out/${{ env.FILENAME }}
171179
retention-days: 31
172180

181+
- name: Remove .tar.bz2 files
182+
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding' || contains(github.ref, 'refs/tags/'))
183+
run: |
184+
echo "Removing .tar.bz2 files from out/ directory..."
185+
rm -f out/*.tar.bz2
186+
rm -f xout/*.tar.bz2
187+
echo "Cleanup complete."
188+
189+
- name: Package
190+
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding' || contains(github.ref, 'refs/tags/'))
191+
working-directory: ${{ env.GITHUB_WORKSPACE }}
192+
run: |
193+
ARCH_SUFFIX=""
194+
if [[ "${{ matrix.ARCH }}" == "64" ]]; then
195+
ARCH_SUFFIX="_memory64"
196+
fi
197+
PTHREADS_SUFFIX=""
198+
if [[ "${{ matrix.PTHREADS }}" == "1" ]]; then
199+
PTHREADS_SUFFIX="_pthreads"
200+
fi
201+
FILENAME="openFrameworksLibs_${{ env.RELEASE }}_emscripten${ARCH_SUFFIX}${PTHREADS_SUFFIX}.tar.bz2"
202+
echo "FILENAME=$FILENAME" >> $GITHUB_ENV
203+
scripts/package.sh
204+
env:
205+
GA_CI_SECRET: ${{ secrets.CI_SECRET }}
206+
ARCH: ${{ matrix.ARCH }}
207+
PTHREADS_ENABLED: ${{ matrix.PTHREADS }}
208+
173209
- name: Update Release emscripten
174210
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
175211
uses: softprops/action-gh-release@v2.1.0

.github/workflows/build-ios.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ env:
1717
NO_FORCE: 1
1818
GA_CI_SECRET: ${{ secrets.CI_SECRET }}
1919
USE_ARTIFACT: true
20+
DISABLE_WORKFLOW: "false"
2021

21-
jobs:
22+
jobs:
2223
build-for-ios-platform:
2324
runs-on: macos-14
2425
strategy:
@@ -28,6 +29,12 @@ jobs:
2829
BUNDLE: ${{ matrix.bundle }}
2930
DEVELOPER_DIR: "/Applications/Xcode.app/Contents/Developer"
3031
steps:
32+
- name: Check if Workflow is disabled
33+
run: |
34+
if [ "${{ env.DISABLE_WORKFLOW }}" == "true" ]; then
35+
echo "Workflow is disabled. Exiting."
36+
exit 1
37+
fi
3138
- name: Determine Release
3239
id: vars
3340
shell: bash
@@ -41,7 +48,7 @@ jobs:
4148
else
4249
echo "RELEASE=latest" >> $GITHUB_ENV
4350
fi
44-
- uses: actions/checkout@v4
51+
- uses: actions/checkout@v4.2.2
4552
- name: Scripts Calc Formula - ${{ env.TARGET }} Bundle ${{ matrix.bundle }}
4653
run: ./scripts/calculate_formulas.sh
4754
- name: Scripts Install

0 commit comments

Comments
 (0)