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
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
*.vert text eol=lf
*.glsl text eol=lf
*.sh text eol=lf
/Tools/Lore/*.patch text eol=lf

/Sources/AdaEngine/AdaEngine.docc/*.png -diff -merge
/Sources/AdaEngine/AdaEngine.docc/*.jpg -diff -merge
Expand Down
32 changes: 29 additions & 3 deletions .github/workflows/shader-graph-apple.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,25 @@ on:
pull_request:
branches: [main, develop]
paths:
- 'Package.swift'
- 'Package.resolved'
- 'Sources/**'
- 'Editor/**'
- 'Plugins/AdaShaderGraphBaker/**'
- 'Plugins/AdaWebExportPlugin/**'
- 'Tests/**'
- 'script/shader_graph*'
- 'script/web_golden_saga.mjs'
- '.github/workflows/shader-graph-apple.yml'
workflow_dispatch:

permissions:
contents: read

concurrency:
group: shader-graph-apple-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
apple:
name: ${{ matrix.check }} with Xcode 26.6
Expand All @@ -23,25 +31,43 @@ jobs:
strategy:
fail-fast: false
matrix:
check: [cpu-baker, metal-native, ipad-simulator]
check: [cpu-baker, saga-default, metal-native, ipad-simulator, studio-web]
env:
DEVELOPER_DIR: /Applications/Xcode_26.6.app
ADAENGINE_PACKAGE_PATH: ${{ github.workspace }}
ADAENGINE_GRAVITY_PACKAGE_PATH: ${{ github.workspace }}/Sources/gravity-lang
ADAENGINE_PACKAGE_PATH: ${{ github.workspace }}/AdaEngine
ADAENGINE_GRAVITY_PACKAGE_PATH: ${{ github.workspace }}/AdaEngine/Sources/gravity-lang
ADA_MCP_LOCAL_PATH: ${{ github.workspace }}/.build-tools/apple-mcp
ADAENGINE_DISABLE_SWAN: '1'
ADAENGINE_SKIP_SWIFTLINT: '1'
steps:
# AdaMCP's local dependency uses the checkout directory as its SwiftPM identity.
- uses: actions/checkout@v4
with:
path: AdaEngine
- name: Check out the pinned local MCP dependency
uses: actions/checkout@v4
with:
repository: AdaEngine/AdaMCP
ref: ed7bb9076f9f8c91e2584ca9b7201df0e03defb1
path: .build-tools/apple-mcp
persist-credentials: false
- name: Check out the pinned mobile runtime
if: matrix.check == 'ipad-simulator'
run: |
git init Sloppy
git -C Sloppy fetch --no-tags --no-recurse-submodules --depth=1 \
https://github.com/TeamSloppy/Sloppy.git 0d8fd03d0269a480b6af3fb4f40333c319e2c398
git -C Sloppy checkout --detach FETCH_HEAD
- name: Build and run the production paths
working-directory: AdaEngine
run: bash script/shader_graph_apple_validation.sh '${{ matrix.check }}' "$RUNNER_TEMP/shader-graph-evidence"
- name: Upload standalone Studio compiler log
if: always() && matrix.check == 'studio-web'
uses: actions/upload-artifact@v4
with:
name: studio-web-compiler-log
path: AdaEngine/.build-tools/ada-tool/*/studio-debug-build.log
if-no-files-found: ignore
- name: Upload logs and actual frames
if: always()
uses: actions/upload-artifact@v4
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/studio-windows-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ jobs:
with:
# AdaMCP references the local package identity AdaEngine.
path: AdaEngine
- uses: actions/checkout@v4
with:
repository: SpectralDragon/SAGA
ref: ${{ vars.ADAENGINE_SAGA_REF }}
path: SAGA
- uses: actions/setup-python@v5
with:
python-version: '3.12'
Expand All @@ -53,11 +58,6 @@ jobs:
uses: ilammy/msvc-dev-cmd@v1
with:
arch: x64
- name: Cache verified Tint
uses: actions/cache@v4
with:
path: AdaEngine/.build-tools/tint
key: tint-windows-x64-${{ hashFiles('AdaEngine/Tools/Tint/toolchain.json', 'AdaEngine/script/ensure_tint.py') }}
- name: Test portable dependency packaging
run: |
python script/test_build_studio_windows.py
Expand All @@ -69,7 +69,6 @@ jobs:
$studioBin = (& ./script/build_studio_windows.ps1 -Configuration release -Jobs 2 | Select-Object -Last 1).Trim()
"bin=$studioBin" >> $env:GITHUB_OUTPUT
"gravity=$env:ADAENGINE_GRAVITY_PACKAGE_PATH" >> $env:GITHUB_OUTPUT
"tint=$env:TINT_EXECUTABLE" >> $env:GITHUB_OUTPUT
- name: Test installed SDK discovery
run: |
# Compile the actual production locators without testable app imports.
Expand All @@ -81,11 +80,10 @@ jobs:
env:
STUDIO_BIN: ${{ steps.build.outputs.bin }}
STUDIO_GRAVITY: ${{ steps.build.outputs.gravity }}
STUDIO_TINT: ${{ steps.build.outputs.tint }}
RELEASE_TAG: ${{ github.event.release.tag_name }}
run: |
$studioVersion = if ($env:RELEASE_TAG) { $env:RELEASE_TAG } else { "ci-$($env:GITHUB_SHA.Substring(0, 12))" }
python script/package_studio_windows.py --bin "$env:STUDIO_BIN" --compiler-root "$env:STUDIO_GRAVITY" --tint "$env:STUDIO_TINT" --version "$studioVersion"
python script/package_studio_windows.py --bin "$env:STUDIO_BIN" --compiler-root "$env:STUDIO_GRAVITY" --version "$studioVersion"
if ($LASTEXITCODE -ne 0) { throw 'Studio packaging failed.' }
- name: Upload ZIP and SHA-256
uses: actions/upload-artifact@v4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading