Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 71 additions & 50 deletions .github/workflows/_build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Build ofLibs

on:
# push:
# branches: ["osx10-15-intel"]
# workflow_dispatch:

workflow_call:
inputs:
lib: { required: true, type: string }
Expand All @@ -10,6 +14,20 @@ on:
brew: { required: false, type: string }
meson: { required: false, type: boolean }

workflow_dispatch:
inputs:
# chosen-os:
# required: true
# type: choice
# options:
# - macOS
lib: { required: true, type: string }
version: { required: true, type: string }
multistrap: { required: false, type: boolean }
linux_apt: { required: false, type: string }
brew: { required: false, type: string }
meson: { required: false, type: boolean }

permissions:
contents: write

Expand All @@ -20,17 +38,18 @@ jobs:
matrix:
include:
# - { platform: linux64, os: ubuntu-latest, toolchain: llvm }
- { platform: linux64, os: ubuntu-22.04, toolchain: llvm }
- { platform: macos, os: macos-26, toolchain: apple-llvm }
- { platform: vs, os: windows-latest, toolchain: vs-stable }
- {
platform: rpi-aarch64,
os: ubuntu-22.04-arm,
prefix: aarch64-linux-gnu,
toolchain: aarch64-linux-gnu-gcc-12,
}

- { platform: emscripten, os: ubuntu-latest, toolchain: emscripten }
# - { platform: linux64, os: ubuntu-22.04, toolchain: llvm }
- { platform: macos, os: macos-latest, toolchain: apple-llvm }
# - { platform: macos, os: macos-13, toolchain: apple-llvm }
# - { platform: vs, os: windows-latest, toolchain: vs-stable }
# - {
# platform: rpi-aarch64,
# os: ubuntu-22.04-arm,
# prefix: aarch64-linux-gnu,
# toolchain: aarch64-linux-gnu-gcc-12,
# }

# - { platform: emscripten, os: ubuntu-latest, toolchain: emscripten }

# - {
# platform: rpi-armv6l,
Expand All @@ -55,7 +74,9 @@ jobs:
# # shell: msys2 -c 'source $GITHUB_ENV; export $(cut -d= -f1 $GITHUB_ENV); {0}'
# }

runs-on: ${{ matrix.os }}
# runs-on: ${{ matrix.os }}
# runs-on: [ ${{ matrix.os }}, self-hosted, ${{ inputs.chosen-os }}"]
runs-on: self-hosted

defaults:
run:
Expand All @@ -76,11 +97,11 @@ jobs:
# key: ${{ inputs.lib }}-${{ runner.os }}-${{ matrix.platform }}-ccache
#
#
- name: Windows Setup MSVC
if: matrix.platform == 'vs'
uses: TheMrMilchmann/setup-msvc-dev@v4
with:
arch: x64
# - name: Windows Setup MSVC
# if: matrix.platform == 'vs'
# uses: TheMrMilchmann/setup-msvc-dev@v4
# with:
# arch: x64
#
- name: Install Meson
if: inputs.meson
Expand All @@ -93,12 +114,12 @@ jobs:
# packages: ${{ inputs.linux_apt }}
# version: 1.0

- name: Linux Apt Packages
if: runner.os == 'Linux' && inputs.linux_apt != ''
# if: matrix.platform == 'linux64' && inputs.linux_apt != ''
run: |
sudo apt-get update -qq
sudo apt-get install -y ${{ inputs.linux_apt }}
# - name: Linux Apt Packages
# if: runner.os == 'Linux' && inputs.linux_apt != ''
# # if: matrix.platform == 'linux64' && inputs.linux_apt != ''
# run: |
# sudo apt-get update -qq
# sudo apt-get install -y ${{ inputs.linux_apt }}

- name: macOS Brew Packages
if: runner.os == 'macOS' && inputs.brew != ''
Expand All @@ -116,12 +137,12 @@ jobs:
# whereis cmake
# cmake --version

- name: Emscripten Install
if: matrix.platform == 'emscripten'
uses: mymindstorm/setup-emsdk@v14
with:
version: 4.0.21
actions-cache-folder: "emsdk-cache"
# - name: Emscripten Install
# if: matrix.platform == 'emscripten'
# uses: mymindstorm/setup-emsdk@v14
# with:
# version: 4.0.21
# actions-cache-folder: "emsdk-cache"

# - name: Verify emsdk
# if: matrix.platform == 'emscripten'
Expand All @@ -132,10 +153,10 @@ jobs:
# emsdk activate latest
# emcc -v

- name: MSYS2 Apt Cross Compile
if: matrix.platform == 'msys2' && runner.os == 'Linux'
run: |
sudo apt install gcc-${{ matrix.prefix }} g++-${{ matrix.prefix }} binutils-${{ matrix.prefix }}
# - name: MSYS2 Apt Cross Compile
# if: matrix.platform == 'msys2' && runner.os == 'Linux'
# run: |
# sudo apt install gcc-${{ matrix.prefix }} g++-${{ matrix.prefix }} binutils-${{ matrix.prefix }}

# - name: MSYS2 Windows
# if: matrix.platform == 'msys2' && runner.os == 'Windows'
Expand All @@ -153,10 +174,10 @@ jobs:
# export PATH=$PATH:/c/hostedtoolcache/windows/chalet-org/chalet/latest/windows-x64
# chalet --version

- name: RPI - Compiler
if: matrix.platform == 'msys2' && runner.os == 'Linux'
run: |
sudo apt install gcc g++ binutils
# - name: RPI - Compiler
# if: matrix.platform == 'msys2' && runner.os == 'Linux'
# run: |
# sudo apt install gcc g++ binutils

# - name: RPI - Apt Cache Cross Compile (No Multistrap)
# if: matrix.platform == 'rpi-aarch64' || matrix.platform == 'rpi-armv6l'
Expand Down Expand Up @@ -222,17 +243,17 @@ jobs:
run: |
otool -l **/*.a | grep minos

- name: RPI Verify Library Compatibility
if: matrix.platform == 'rpi-aarch64'
run: |
aarch64-linux-gnu-readelf -d **/*.a 2>/dev/null | grep -E "GLIBC|CXXABI" || true
# Should show versions like GLIBC_2.36, NOT 2.38+
# - name: RPI Verify Library Compatibility
# if: matrix.platform == 'rpi-aarch64'
# run: |
# aarch64-linux-gnu-readelf -d **/*.a 2>/dev/null | grep -E "GLIBC|CXXABI" || true
# # Should show versions like GLIBC_2.36, NOT 2.38+

- name: Rename and Publish Release
env:
# GITHUB_TOKEN: ${{ github.TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
mv dist/${{ inputs.lib }}.zip ofLibs_${{ inputs.lib }}_${{ matrix.platform }}.zip
ls -alF *.zip
gh release upload ${{ inputs.version }} *.zip --clobber
# - name: Rename and Publish Release
# env:
# # GITHUB_TOKEN: ${{ github.TOKEN }}
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# run: |
# mv dist/${{ inputs.lib }}.zip ofLibs_${{ inputs.lib }}_${{ matrix.platform }}.zip
# ls -alF *.zip
# gh release upload ${{ inputs.version }} *.zip --clobber
1 change: 1 addition & 0 deletions .github/workflows/assimp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
paths:
- .github/workflows/assimp.yml
- assimp/**
workflow_dispatch:

jobs:
ci:
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/pffft.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: pffft

on:
push:
paths:
- .github/workflows/pffft.yml
- pffft/**

jobs:
ci:
permissions:
contents: write

uses: ./.github/workflows/_build.yml
# with: { lib: pffft, version: v1.0 }
with: { lib: pffft, version: add }
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/pixman.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ jobs:
contents: write

uses: ./.github/workflows/_build.yml
with: { lib: pixman, version: v1.0, meson: true }
with: { lib: pixman, version: add, meson: true }
secrets: inherit
3 changes: 2 additions & 1 deletion .github/workflows/pugixml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ on:
paths:
- pugixml/**
- .github/workflows/pugixml.yml

workflow_dispatch:

jobs:
ci:
permissions:
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,10 @@ dist/**
**/build/**
**/chalet_external/**
**/dist/**

openssl-curl/Build-OpenSSL-cURL/curl/*/**
openssl-curl/Build-OpenSSL-cURL/openssl/*/**
openssl-curl/curl/**
openssl-curl/*.zip
mango/*/**
mango2/*/**
8 changes: 4 additions & 4 deletions 2/FreeImage/chalet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ targets:
- CMAKE_EXECUTABLE_SUFFIX=.js
defines[platform:macos]:
- CMAKE_OSX_ARCHITECTURES=arm64;x86_64
- CMAKE_OSX_DEPLOYMENT_TARGET=11.6
- CMAKE_OSX_DEPLOYMENT_TARGET=10.15

libpng:
kind: cmakeProject
Expand Down Expand Up @@ -115,7 +115,7 @@ targets:
# - ZLIB_ROOT=${externalBuild:zlib}/install
# - ZLIB_ROOT=${externalBuild:zlib}
defines[platform:macos]:
- CMAKE_OSX_DEPLOYMENT_TARGET=11.6
- CMAKE_OSX_DEPLOYMENT_TARGET=10.15
- CMAKE_OSX_ARCHITECTURES=arm64;x86_64
defines[:web]:
# - ZLIB_LIBRARY=${cwd}/${externalBuild:zlib-ng}/ext.zlib-ng/install/lib
Expand Down Expand Up @@ -187,7 +187,7 @@ targets:

defines[platform:macos]:
- CMAKE_OSX_ARCHITECTURES=x86_64;arm64
- CMAKE_OSX_DEPLOYMENT_TARGET=11.6
- CMAKE_OSX_DEPLOYMENT_TARGET=10.15
# - CMAKE_C_VISIBILITY_PRESET=hidden
# - CMAKE_CXX_VISIBILITY_PRESET=hidden
# - CMAKE_VISIBILITY_INLINES_HIDDEN=ON
Expand Down Expand Up @@ -298,7 +298,7 @@ targets:
# - LIBTIFF_LIBRARY=${cwd}/${externalBuild:libtiff}/ext.libtiff/install/lib/tiff.lib

defines[platform:macos]:
- CMAKE_OSX_DEPLOYMENT_TARGET=11.6
- CMAKE_OSX_DEPLOYMENT_TARGET=10.15
- CMAKE_OSX_ARCHITECTURES=x86_64;arm64

defines[toolchain:msvc]:
Expand Down
2 changes: 1 addition & 1 deletion 2/FreeImageRe/chalet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ targets:
- ZLIB_INCLUDE_DIRS=${cwd}/${externalBuild:zlib-ng}/ext.zlib-ng/install/include

defines[platform:macos]:
- CMAKE_OSX_DEPLOYMENT_TARGET=11.6
- CMAKE_OSX_DEPLOYMENT_TARGET=10.15
- CMAKE_OSX_ARCHITECTURES=x86_64;arm64

distribution:
Expand Down
2 changes: 1 addition & 1 deletion 2/OpenImageIO/chalet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ targets:
- OIIO_BUILD_TESTS=OFF

defines[platform:macos]:
- CMAKE_OSX_DEPLOYMENT_TARGET=11.6
- CMAKE_OSX_DEPLOYMENT_TARGET=10.15
# - CMAKE_OSX_ARCHITECTURES=x86_64;arm64

distribution:
Expand Down
2 changes: 1 addition & 1 deletion 2/WiiC/chalet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ targets:
# - CMAKE_INSTALL_FULL_LIBDIR=lib
defines[platform:macos]:
# - CMAKE_OSX_ARCHITECTURES=x86_64;arm64
- CMAKE_OSX_DEPLOYMENT_TARGET=11.6
- CMAKE_OSX_DEPLOYMENT_TARGET=10.15
# test:
# kind: script
# file: test.sh
Expand Down
2 changes: 1 addition & 1 deletion 2/eigen/chalet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ targets:
defines[platform:macos]:
# - APPLE_FRAMEWORK=ON
- CPU_BASELINE=NATIVE
- CMAKE_OSX_DEPLOYMENT_TARGET=11.6
- CMAKE_OSX_DEPLOYMENT_TARGET=10.15
- CMAKE_OSX_ARCHITECTURES=x86_64;arm64

distribution:
Expand Down
4 changes: 2 additions & 2 deletions 2/lcms2/chalet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ targets:
# - prefix=${cwd}/${externalBuild:${name}}/install

defines[platform:macos]:
- c_args=-mmacos-version-min=11.6
- cpp_args=-mmacos-version-min=11.6
- c_args=-mmacos-version-min=10.15
- cpp_args=-mmacos-version-min=10.15

defines[toolchain:msvc]:
- b_vscrt=static_from_buildtype
Expand Down
2 changes: 1 addition & 1 deletion 2/libjpeg/chalet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ targets:

defines[platform:macos]:
- CMAKE_OSX_ARCHITECTURES=x86_64;arm64
- CMAKE_OSX_DEPLOYMENT_TARGET=11.6
- CMAKE_OSX_DEPLOYMENT_TARGET=10.15

distribution:
libjpeg:
Expand Down
4 changes: 2 additions & 2 deletions 2/libpng/chalet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ targets:
- CMAKE_EXECUTABLE_SUFFIX=.js
defines[platform:macos]:
- CMAKE_OSX_ARCHITECTURES=arm64;x86_64
- CMAKE_OSX_DEPLOYMENT_TARGET=11.6
- CMAKE_OSX_DEPLOYMENT_TARGET=10.15

libpng:
kind: cmakeProject
Expand Down Expand Up @@ -77,7 +77,7 @@ targets:
# - ZLIB_ROOT=${externalBuild:zlib}/install
# - ZLIB_ROOT=${externalBuild:zlib}
defines[platform:macos]:
- CMAKE_OSX_DEPLOYMENT_TARGET=11.6
- CMAKE_OSX_DEPLOYMENT_TARGET=10.15
- CMAKE_OSX_ARCHITECTURES=arm64;x86_64
defines[:web]:
# - ZLIB_LIBRARY=${cwd}/${externalBuild:zlib-ng}/ext.zlib-ng/install/lib
Expand Down
4 changes: 2 additions & 2 deletions 2/libtiff/chalet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ targets:

defines[platform:macos]:
- CMAKE_OSX_ARCHITECTURES=x86_64;arm64
- CMAKE_OSX_DEPLOYMENT_TARGET=11.6
- CMAKE_OSX_DEPLOYMENT_TARGET=10.15

defines[toolchain:msvc]:
- CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
Expand Down Expand Up @@ -93,7 +93,7 @@ targets:

defines[platform:macos]:
- CMAKE_OSX_ARCHITECTURES=x86_64;arm64
- CMAKE_OSX_DEPLOYMENT_TARGET=11.6
- CMAKE_OSX_DEPLOYMENT_TARGET=10.15
- CMAKE_C_VISIBILITY_PRESET=hidden
- CMAKE_CXX_VISIBILITY_PRESET=hidden
- CMAKE_VISIBILITY_INLINES_HIDDEN=ON
Expand Down
4 changes: 2 additions & 2 deletions 2/libuvc/chalet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ targets:
# # - CMAKE_INSTALL_FULL_LIBDIR=lib
# defines[platform:macos]:
# - CMAKE_OSX_ARCHITECTURES=x86_64;arm64
# - CMAKE_OSX_DEPLOYMENT_TARGET=11.6
# - CMAKE_OSX_DEPLOYMENT_TARGET=10.15
libuvc:
kind: cmakeProject
location: ${external:${name}}
Expand Down Expand Up @@ -85,7 +85,7 @@ targets:
- LibUSB_FOUND=TRUE
defines[platform:macos]:
- CMAKE_OSX_ARCHITECTURES=x86_64;arm64
- CMAKE_OSX_DEPLOYMENT_TARGET=11.6
- CMAKE_OSX_DEPLOYMENT_TARGET=10.15

distribution:
libuvc:
Expand Down
2 changes: 1 addition & 1 deletion 2/libxml2/chalet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ targets:

defines[platform:macos]:
- CMAKE_OSX_ARCHITECTURES=x86_64;arm64
- CMAKE_OSX_DEPLOYMENT_TARGET=11.6
- CMAKE_OSX_DEPLOYMENT_TARGET=10.15

libxml2_install:
kind: script
Expand Down
Loading