Skip to content

Commit 3e037c3

Browse files
authored
Linux Updates / Toolchain Fixes / bash Script Fixing bonanza (#471)
* Workflows Disable others * Github Actions Workflow Update - Linux Optimsed upload artefacts for tags / caching (just for main branchs against prs and merges) * Cmake debug * docker fix * Install linux cross * GCC arm64 13 * disabled workflow exit 1 to exit 78 (skip github action result). github actions cache clear tests * Actions fix. test macOS precheck on ubuntu * Fix toolchain Jetson * macos disable action * macOS action * Action Github Optimisation * format scripts unix line endings * Line Formatting * .gitattributes added * Script comands * downloader [4.3.4 ~ 4.4.0] * Fix Action Linux armv6l * Linux Arm cross compilers scripts * Chmod * chmod * Actions - Added All Targets - Disable * linux pre * Tool chain linux configure * Toolchain configure * Toolchain configure validate. Actions fix names to rpi / cross * Actions yml * Actions Enable Android Test other runners * Configure GCC Path * Actions Setup * Android Action. Fixes for rpi yml. Setup / install split * Android * Brotli fix. armv6l fix configure * watchOS fix build types * Apothecary Android Fixes NDK Missing cfags/ldflags linux arm64 * opencv fix for xros/tvos videoio * Actions fixes * Android zlb and libxml2 fixes * Android fix platform Actions fix rpi / rename platform macos targets - scripts split install and build rpi. OpenCV DEF to DEFINES for PKL Setup for Rpi added bookworm / bullseye variable. * Action rpi cross variable * Fix for Rpi action script calling MetalAngle disabled for catos / visionOS for moment need to check scheme * Rpi build fix path level metalangle disable watchos catos/xros set skipped all building * Rpi toolchain variable fixes - CROSS_CPU added (easier to see) watchOS is success -> skipped * Actions Enable all for merge. Disable in progress - Android, Linux Cross (arm64, jetson), Rpi
1 parent 9e01789 commit 3e037c3

Some content is hidden

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

70 files changed

+2160
-1370
lines changed

.gitattributes

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Set default behavior for text files, normalize to native line endings
2+
* text=auto
3+
4+
# Explicitly declare text files to normalize
5+
*.cpp text
6+
*.h text
7+
*.mm text
8+
9+
# Files with CRLF line endings for Windows
10+
*.sln text eol=crlf
11+
*.vcxproj* text eol=crlf
12+
.appveyor.yml text eol=crlf
13+
*.bat text eol=crlf
14+
15+
# Files with LF line endings for Unix-like systems
16+
*.sh text eol=lf
17+
18+
# Binary files (no EOL normalization)
19+
*.png binary
20+
*.jpg binary
21+
22+
# Exclude .patch files in apothecary from EOL normalization
23+
**/*.patch -text

.github/disabled/build-android.yml

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

.github/disabled/build-vs2019.yml

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

.github/disabled/build-vs2022-x64-clang.yml

Lines changed: 0 additions & 86 deletions
This file was deleted.
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
name: build-android
2+
3+
on:
4+
push:
5+
paths-ignore:
6+
- '**/README.md'
7+
pull_request:
8+
paths-ignore:
9+
- '**/README.md'
10+
11+
env:
12+
TARGET: "android"
13+
NO_FORCE: 1
14+
GA_CI_SECRET: ${{ secrets.CI_SECRET }}
15+
USE_ARTIFACT: true
16+
DISABLE_WORKFLOW: "true"
17+
18+
jobs:
19+
pre-check:
20+
runs-on: ubuntu-latest
21+
outputs:
22+
workflow_disabled: ${{ steps.check-disabled.outputs.disabled }}
23+
steps:
24+
- name: Check if Workflow is disabled
25+
id: check-disabled
26+
shell: bash
27+
run: |
28+
if [ "${{ env.DISABLE_WORKFLOW }}" == "true" ]; then
29+
echo "disabled=true" >> $GITHUB_ENV
30+
echo "::set-output name=disabled::true"
31+
else
32+
echo "::set-output name=disabled::false"
33+
fi
34+
build-macos-platforms:
35+
if: needs.pre-check.outputs.workflow_disabled != 'true'
36+
needs: pre-check
37+
runs-on: ubuntu-latest
38+
strategy:
39+
matrix:
40+
ARCH: [armv7, arm64, x86, x86_64]
41+
SDK: ["35.0.0"]
42+
NDK: ["27.2.12479018"] #"26.3.11579264",
43+
env:
44+
ARCH: ${{ matrix.ARCH }}
45+
SDK: ${{ matrix.SDK }}
46+
NDK: ${{ matrix.NDK }}
47+
NDK_ROOT: ${{ matrix.NDK }}
48+
steps:
49+
- uses: actions/checkout@v4.2.2
50+
- name: Determine Release
51+
id: vars
52+
shell: bash
53+
run: |
54+
if [[ "${{ github.ref }}" == refs/tags/* ]]; then
55+
echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
56+
elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
57+
echo "RELEASE=nightly" >> $GITHUB_ENV
58+
elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
59+
echo "RELEASE=latest" >> $GITHUB_ENV
60+
else
61+
echo "RELEASE=latest" >> $GITHUB_ENV
62+
fi
63+
- name: Scripts Setup
64+
run: ./scripts/$TARGET/setup.sh
65+
- name: Scripts Calc Formula Android - ${{ matrix.ARCH }}
66+
run: ./scripts/calculate_formulas.sh
67+
- name: Scripts Install
68+
run: ./scripts/$TARGET/install.sh
69+
- name: build
70+
run: ./scripts/build.sh
71+
env:
72+
GA_CI_SECRET: ${{ secrets.CI_SECRET }}
73+
ARCH: ${{ matrix.ARCH }}
74+
NDK: ${{ matrix.NDK }}
75+
- name: List output directory
76+
run: ls -lah out/
77+
- name: Package
78+
if: (github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding'))
79+
working-directory: ${{ env.GITHUB_WORKSPACE }}
80+
run: scripts/package.sh
81+
env:
82+
BUNDLE: ${{ matrix.bundle }}
83+
GA_CI_SECRET: ${{ secrets.CI_SECRET }}
84+
- name: Update Release emscripten
85+
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
86+
uses: softprops/action-gh-release@v2.1.0
87+
with:
88+
token: ${{ secrets.GITHUB_TOKEN }}
89+
tag_name: ${{ env.RELEASE }}
90+
files: out/openFrameworksLibs_${{ env.release }}_android_${{ matrix.cfg.arch }}.zip

0 commit comments

Comments
 (0)