This commit is contained in:
ConfiG 2024-06-28 22:06:51 +03:00 committed by GitHub
parent 5eedc99b4f
commit 08ccb5422b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 14 deletions

View file

@ -15,7 +15,7 @@ outputs:
description: 'Extra stuff for CMake build step' description: 'Extra stuff for CMake build step'
value: | value: |
python3 ./ninjatracing/ninjatracing ./build/.ninja_log > ./build-debug-info/ninja-trace.json python3 ./ninjatracing/ninjatracing ./build/.ninja_log > ./build-debug-info/ninja-trace.json
#${{ inputs.has-sccache && 'sccache --show-adv-stats' || '' }} ${{ inputs.has-sccache && 'sccache --show-adv-stats' || '' }}
runs: runs:
using: "composite" using: "composite"

View file

@ -6,12 +6,12 @@ on:
build-debug-info: build-debug-info:
description: 'Profile and debug the build process' description: 'Profile and debug the build process'
required: false required: false
default: true default: false
type: boolean type: boolean
use-ccache: use-ccache:
description: 'Enable ccache/sccache' description: 'Enable ccache/sccache'
required: false required: false
default: false default: true
type: boolean type: boolean
pull_request: pull_request:
push: push:
@ -148,14 +148,14 @@ jobs:
id: build-debug-info id: build-debug-info
uses: ./.github/actions/build-debug-info uses: ./.github/actions/build-debug-info
with: with:
has-sccache: false has-sccache: ${{ inputs.use-ccache }}
- name: Setup caches - name: Setup caches
uses: ./.github/actions/setup-cache uses: ./.github/actions/setup-cache
with: with:
host: mac host: mac
target: mac target: mac
use-ccache: false use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }}
if: false if: false
- name: Setup Ninja - name: Setup Ninja
@ -165,9 +165,8 @@ jobs:
- name: Install LLVM - name: Install LLVM
run: | run: |
brew install llvm@14 brew install llvm@17
echo "/opt/homebrew/opt/llvm@14/bin" >> $GITHUB_PATH echo "/opt/homebrew/opt/llvm@17/bin" >> $GITHUB_PATH
if: false
- name: Setup CLI - name: Setup CLI
uses: geode-sdk/cli/.github/actions/setup@main uses: geode-sdk/cli/.github/actions/setup@main
@ -180,18 +179,12 @@ jobs:
-DCMAKE_AR='/usr/bin/ar' -DCMAKE_AR='/usr/bin/ar'
-DCMAKE_RANLIB='/usr/bin/ranlib' -DCMAKE_RANLIB='/usr/bin/ranlib'
-DGEODE_DISABLE_PRECOMPILED_HEADERS=Off -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off
-DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
-DCMAKE_OSX_SYSROOT=/Applications/Xcode_14.3.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.3.sdk
${{ steps.build-debug-info.outputs.extra-configure }} ${{ steps.build-debug-info.outputs.extra-configure }}
env:
MACOSX_DEPLOYMENT_TARGET: "10.15"
- name: Build - name: Build
run: | run: |
${{ env.base-build-command }} ${{ env.base-build-command }}
${{ steps.build-debug-info.outputs.extra-build }} ${{ steps.build-debug-info.outputs.extra-build }}
env:
MACOSX_DEPLOYMENT_TARGET: "10.15"
- name: Upload Artifacts - name: Upload Artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4

View file

@ -24,6 +24,9 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS")
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
endif() endif()
# only exists as a global property
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15")
target_link_libraries(${PROJECT_NAME} INTERFACE target_link_libraries(${PROJECT_NAME} INTERFACE
"-framework Cocoa" "-framework Cocoa"
"-framework OpenGL" "-framework OpenGL"