Skip to content

Commit 6c94bdd

Browse files
Merge remote-tracking branch 'origin/master' into automation/master-sync/feature/breakingchanges
# Conflicts: # build/test-scripts/ios-uitest-run.sh
2 parents 820557d + ae4612a commit 6c94bdd

4 files changed

Lines changed: 45 additions & 5 deletions

File tree

.github/workflows/claude-code-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
# blocks exfil URL patterns (`gh ... view https://attacker/<secret>`),
9090
# run-summary disabled by default, and ignoring issues/comments edited
9191
# after trigger.
92-
uses: anthropics/claude-code-action@428971d2ecd6e3a7cb0ee0da2a3a8b33fdb3678d # v1.0.157
92+
uses: anthropics/claude-code-action@6c0083bb7289c31716797a039b6367b3079cc46e # v1.0.162
9393
with:
9494
anthropic_api_key: ${{ secrets.ANTHROPIC_CODEREVIEW_KEY }}
9595
# Use the job's scoped Actions token instead of OIDC/GitHub App auth,

.github/workflows/master-sync.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
branches: ${{ steps.list.outputs.branches }}
6262
count: ${{ steps.list.outputs.count }}
6363
steps:
64-
- uses: actions/checkout@v6
64+
- uses: actions/checkout@v7
6565
with:
6666
ref: master
6767
fetch-depth: 0
@@ -125,7 +125,7 @@ jobs:
125125
# Swap-seam: SYNC_BOT_TOKEN (PAT/App) wins if present, else the default token.
126126
SYNC_TOKEN: ${{ secrets.SYNC_BOT_TOKEN || github.token }}
127127
steps:
128-
- uses: actions/checkout@v6
128+
- uses: actions/checkout@v7
129129
with:
130130
fetch-depth: 0
131131
token: ${{ env.SYNC_TOKEN }}

build/test-scripts/ios-uitest-run.sh

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,31 @@
11
#!/bin/bash
2+
# ===========================================================================
3+
# ios-uitest-run.sh — CI (Azure DevOps) entry point that runs the SamplesApp
4+
# UI test suites against an iOS Simulator on a macOS hosted agent.
5+
#
6+
# What it does:
7+
# 1. Picks the NUnit test filter from $UITEST_SNAPSHOTS_ONLY /
8+
# $UITEST_AUTOMATED_GROUP (snapshot groups, automated groups 1-5,
9+
# RuntimeTests, Benchmarks).
10+
# 2. Waits for the target simulator runtime/device to exist and boots it.
11+
# 3. Installs the pre-built SamplesApp bundle on the simulator with `idb`
12+
# (Meta's iOS Development Bridge, https://github.com/facebook/idb):
13+
# `xcrun simctl install` was historically unreliable for this
14+
# (see microsoft/appcenter#2389), idb is the dependable path.
15+
# 4. Runs the tests through the NUnit console, transforms the results and
16+
# maintains the failed-tests re-run list for retry stages.
17+
#
18+
# Tooling / supply-chain notes (idb):
19+
# - `idb-companion` comes from Meta's Homebrew tap `facebook/fb`
20+
# (github.com/facebook/homebrew-fb). The formula pins the binary artifact
21+
# of facebook/idb release v1.1.8 together with its sha256, so what gets
22+
# installed is reproducible byte-for-byte; the tap itself has been
23+
# dormant since 2022.
24+
# - Newer Homebrew refuses formulas from third-party taps unless explicitly
25+
# trusted (`brew trust`) — see the install section below.
26+
# - `fb-idb` (the Python client) is installed from PyPI via pipx, pinned to
27+
# Python 3.12 (asyncio breakage under 3.14) but not version-pinned.
28+
# ===========================================================================
229
set -euo pipefail
330
IFS=$'\n\t'
431

@@ -172,8 +199,21 @@ then
172199
# formulae without an explicit trust, so trust facebook/fb and install the
173200
# fully-qualified formula (a bare "idb-companion" now resolves to the wrong cask).
174201
brew tap facebook/fb >/dev/null 2>&1 || true
202+
<<<<<<< HEAD
175203
brew trust facebook/fb >/dev/null 2>&1 || true
176204
brew list --versions idb-companion >/dev/null 2>&1 || brew install facebook/fb/idb-companion
205+
=======
206+
# Newer Homebrew on the runner images gates third-party taps: installing
207+
# idb-companion fails with "Refusing to load formula facebook/fb/idb-companion
208+
# from untrusted tap facebook/fb" unless explicitly trusted. Trust only the
209+
# formula we need (least privilege); fall back to tap-level trust for brew
210+
# versions that only support that form. Older brews have no `trust` command
211+
# at all — best effort, the install below still surfaces any real failure.
212+
brew trust --formula facebook/fb/idb-companion >/dev/null 2>&1 \
213+
|| brew trust facebook/fb >/dev/null 2>&1 \
214+
|| true
215+
brew list --versions idb-companion >/dev/null 2>&1 || brew install idb-companion
216+
>>>>>>> origin/master
177217

178218
# 3) Install fb-idb under Python 3.12
179219
pipx uninstall fb-idb >/dev/null 2>&1 || true

doc/import_external_docs.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ Set-PSDebug -Trace 1
1010
# Each entry: repo name -> @{ ref = '<commit|branch>'; dest = '<sub-folder>'? }
1111
$external_docs = @{
1212
# use either commit, or branch name to use its latest commit
13-
"uno.wasm.bootstrap" = @{ ref="a73ee0878c47fa70198e6f5872a8c1bd9af143e5" } #latest main commit
13+
"uno.wasm.bootstrap" = @{ ref="1e094106842f6e7f43075f06d2a0354077da3a0f" } #latest main commit
1414
"uno.themes" = @{ ref="5337d0bbced5b917a5e373d4206c3f34fdeefa9b" } #latest master commit
1515
"uno.toolkit.ui" = @{ ref="2fb1f77adb6b552bb8c86880837048d9fc0c279b" } #latest main commit
1616
"uno.check" = @{ ref="da57de1d9dd4d3ef47623a80999d5df1b5ffcb10" } #latest main commit
1717
"uno.xamlmerge.task" = @{ ref="081dcfa44b5ce24ac0948675e5ee6b781e2107bc" } #latest main commit
1818
"figma-docs" = @{ ref="842a2792282b88586a337381b2b3786e779973b4" } #latest main commit
1919
"uno.resizetizer" = @{ ref="e422ad9f26cf21ed02c339e717e0dd0189bb566e" } #latest main commit
2020
"uno.uitest" = @{ ref="94d027295b779e28064aebf99aeaee2b393ad558" } #latest master commit
21-
"uno.extensions" = @{ ref="571a3686982390a9a626a9ad87509197ab5a9aa3" } #latest main commit
21+
"uno.extensions" = @{ ref="b781901429a5061db6c14d3e936dc5aa58e4c205" } #latest main commit
2222
"workshops" = @{ ref="3515c29e03dea36cf2206d797d1bf9f8620370e3" } #latest master commit
2323
"uno.samples" = @{ ref="e593c241f9d00eb21ca20f67fd3639e1b12f8dd9" } #latest master commit
2424
"uno.chefs" = @{ ref="d54bceea13406bca23e870a89ecee469813c69b3" } #latest main commit

0 commit comments

Comments
 (0)