Skip to content
Merged
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
54 changes: 48 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ on:

env:
WORKSPACE: ${{ github.workspace }}
DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
BUILD_NUMBER: ${{ github.event.inputs.buildNumber }}
YEAR: ${{ github.event.inputs.buildYear }}

jobs:
source-code:
name: Check out and process source code
runs-on: macos-13
runs-on: macos-26
steps:
- run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
- uses: actions/checkout@v4
Expand All @@ -41,7 +41,7 @@ jobs:

native:
needs: source-code
runs-on: macos-15
runs-on: macos-26
steps:
- run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
- name: Get processed code
Expand All @@ -62,6 +62,47 @@ jobs:
name: Native
path: ./output

Xcode-template-matrix-26:
strategy:
matrix:
runner:
- macos-26
xcode:
- Xcode_26.0
target:
- template
- template-angle
platform:
- iphone
- tvos
needs: source-code
runs-on: ${{ matrix.runner }}
env:
DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer
TEMPLATE_TARGET: ${{ matrix.target }}
TEMPLATE_PLATFORM: ${{ matrix.platform }}
steps:
- run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
- name: Get processed code
uses: actions/download-artifact@v4
with:
name: SourceCode
path: SourceCode
- name: Unpack source code
run: tar -xzf SourceCode/corona.tgz
- run: ./tools/GHAction/daily_env.sh
- name: Build templates
working-directory: ./platform/${{ matrix.platform }}
run: ./gh_build_templates.sh
env:
CERT_PASSWORD: ${{ secrets.CertPassword }}
- name: Build templates JSON spec
run: ./tools/GHAction/generate_xcode_jsons.py
- name: Upload templates
uses: actions/upload-artifact@v4
with:
name: Templates-${{ matrix.platform }}-${{ matrix.xcode }}-${{ matrix.target }}
path: ./output
Xcode-template-matrix-15:
strategy:
matrix:
Expand Down Expand Up @@ -108,6 +149,7 @@ jobs:

collect-ios-templates:
needs:
- Xcode-template-matrix-26
- Xcode-template-matrix-15
runs-on: ubuntu-latest
if: (! failure() && ! cancelled())
Expand Down Expand Up @@ -307,7 +349,7 @@ jobs:
- webtemplate
# - linux
if: (! failure() && ! cancelled())
runs-on: macos-15
runs-on: macos-26
steps:
- run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
- name: Get processed code
Expand Down Expand Up @@ -404,7 +446,7 @@ jobs:
exit 1

check-notarization:
runs-on: macos-15
runs-on: macos-26
steps:
- name: Check notarization credentials
run: |
Expand All @@ -428,7 +470,7 @@ jobs:
webtemplate:
needs:
- source-code
runs-on: macos-15
runs-on: macos-26
env:
DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
steps:
Expand Down
2 changes: 1 addition & 1 deletion platform/mac/AppDelegate.mm
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ static void SigPIPEHandler(int signal)

NSString *kosVersionMinimum = @"10.9"; // we refuse to run on OSes older than this
NSString *kosVersionPrevious = @"10.12"; // should be updated as Apple releases new OSes
NSString *kosVersionCurrent = @"15.99"; // should be updated as Apple releases new OSes; we will run on this one and the previous one
NSString *kosVersionCurrent = @"26.99"; // should be updated as Apple releases new OSes; we will run on this one and the previous one

// These tags are defined on the various DeviceBuild dialogs in Interface Builder
enum {
Expand Down
4 changes: 2 additions & 2 deletions tools/CoronaBuilder/BuilderPluginDownloader.lua
Original file line number Diff line number Diff line change
Expand Up @@ -439,9 +439,9 @@ function DownloadPluginsMain(args, user, buildYear, buildRevision)
end
else
if forceLoad then
config:write('OTHER_LDFLAGS = $(inherited) $(CORONA_CUSTOM_LDFLAGS) -force_load "$(CORONA_ROOT)/Corona/ios/lib/libplayer.a" \n')
config:write('OTHER_LDFLAGS = $(inherited) $(CORONA_CUSTOM_LDFLAGS) -force_load "$(CORONA_ROOT)/Corona/ios/lib/libplayer.a" -Xlinker -undefined -Xlinker dynamic_lookup \n')
else
config:write('OTHER_LDFLAGS = $(inherited) $(CORONA_CUSTOM_LDFLAGS) -all_load -lplayer\n')
config:write('OTHER_LDFLAGS = $(inherited) $(CORONA_CUSTOM_LDFLAGS) -all_load -lplayer -Xlinker -undefined -Xlinker dynamic_lookup\n')
end
end

Expand Down
1 change: 0 additions & 1 deletion tools/buildsys-ios/libtemplate/Defaults.lua
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ function M:updateFlags( minVersion )
self.options.flags = {
'-ObjC',
'-all_load',
'-ld_classic',
'-fobjc-link-runtime',
'-miphoneos-version-min=' .. minVersion,
'-std=c++11',
Expand Down
Loading