Skip to content

Commit 7bf33d6

Browse files
authored
Merge branch 'master' into multichain-2
2 parents dd07f8a + 84b8d16 commit 7bf33d6

483 files changed

Lines changed: 8586 additions & 4489 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.clang-format

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# please use clang-format version 16 or later
22

3-
Standard: c++17
43
AccessModifierOffset: -8
54
AlignAfterOpenBracket: Align
65
AlignConsecutiveAssignments: false
@@ -106,6 +105,10 @@ TypenameMacros:
106105
- 'DARRAY'
107106
UseTab: ForContinuationAndIndentation
108107
---
108+
Language: Cpp
109+
Standard: c++17
110+
InsertBraces: true
111+
---
109112
Language: ObjC
110113
AccessModifierOffset: 2
111114
AlignArrayOfStructures: Right
@@ -207,3 +210,4 @@ SpacesInLineCommentPrefix:
207210
Standard: c++17
208211
TabWidth: 4
209212
UseTab: Never
213+
...

.git-blame-ignore-revs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ dcc07cfe4ed3f7fb60c7a0d1563236eac0a0b053
1212
f4733ec6a26bac21699daf3dfd6857ff5a1d3c07
1313
b8cfacaec38d31413b0cd82718c9dc1e36beb9af
1414
a1fbf1015f4079b79dc9ef4f6abecf67920e93cf
15+
30b63c68490be1b0e0cb250a61c9eca1b01c9076

.github/actions/services-validator/action.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,9 @@ runs:
4444
- name: Install and Configure Python 🐍
4545
shell: bash
4646
run: |
47-
: Install and Configure Python 🐍
47+
: Configure Python 🐍
4848
if [[ "${RUNNER_DEBUG}" ]]; then set -x; fi
4949
50-
echo ::group::Python Set Up
51-
if [[ "${RUNNER_OS}" == Linux ]]; then
52-
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
53-
echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
54-
brew install --overwrite --quiet python3
55-
fi
56-
5750
python3 -m venv .venv
5851
5952
source .venv/bin/activate

.github/workflows/analyze-project.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
macos:
4343
name: macOS 🍏 (clang-analyze)
44-
runs-on: macos-15
44+
runs-on: macos-26
4545
defaults:
4646
run:
4747
shell: zsh --no-rcs --errexit --pipefail {0}
@@ -57,8 +57,8 @@ jobs:
5757
: Set Up Environment 🔧
5858
if (( ${+RUNNER_DEBUG} )) setopt XTRACE
5959
60-
print '::group::Enable Xcode 16.4'
61-
sudo xcode-select --switch /Applications/Xcode_16.4.app/Contents/Developer
60+
print '::group::Enable Xcode 26.5'
61+
sudo xcode-select --switch /Applications/Xcode_26.5.app/Contents/Developer
6262
print '::endgroup::'
6363
6464
print '::group::Clean Homebrew Environment'
@@ -71,6 +71,12 @@ jobs:
7171
if (( #remove_formulas )) brew uninstall --ignore-dependencies ${remove_formulas}
7272
print '::endgroup::'
7373
74+
local xcode_cas_path="${HOME}/Library/Developer/Xcode/DerivedData/CompilationCache.noindex"
75+
76+
if ! [[ -d ${xcode_cas_path} ]] mkdir -p ${xcode_cas_path}
77+
78+
print "xcodeCasPath=${xcode_cas_path}" >> $GITHUB_OUTPUT
79+
7480
- name: Set Up Code Signing 🔑
7581
uses: ./.github/actions/setup-macos-codesigning
7682
id: codesign
@@ -96,6 +102,7 @@ jobs:
96102
CODESIGN_IDENT: ${{ steps.codesign.outputs.codesignIdent }}
97103
CODESIGN_TEAM: ${{ steps.codesign.outputs.codesignTeam }}
98104
PROVISIONING_PROFILE: ${{ steps.codesign.outputs.provisioningProfileUUID }}
105+
XCODE_CAS_PATH: ${{ steps.setup.outputs.xcodeCasPath }}
99106
run: |
100107
: Run macOS Build
101108

.github/workflows/build-project.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
6060
macos-build:
6161
name: macOS 🍏
62-
runs-on: macos-15
62+
runs-on: macos-26
6363
needs: check-event
6464
strategy:
6565
fail-fast: false
@@ -80,8 +80,8 @@ jobs:
8080
: Set Up Environment 🔧
8181
if (( ${+RUNNER_DEBUG} )) setopt XTRACE
8282
83-
print '::group::Enable Xcode 26.1'
84-
sudo xcode-select --switch /Applications/Xcode_26.1.app/Contents/Developer
83+
print '::group::Enable Xcode 26.5'
84+
sudo xcode-select --switch /Applications/Xcode_26.5.app/Contents/Developer
8585
print '::endgroup::'
8686
8787
print '::group::Clean Homebrew Environment'

.github/workflows/check-format.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
failCondition: error
1616

1717
swift-format:
18-
runs-on: macos-15
18+
runs-on: macos-26
1919
steps:
2020
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2121
with:

.github/workflows/dispatch.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
services-validation:
4040
name: Validate Services 🕵️
4141
if: github.repository_owner == 'obsproject' && inputs.job == 'services'
42-
runs-on: macos-15
42+
runs-on: macos-26
4343
permissions:
4444
checks: write
4545
contents: write
@@ -73,7 +73,7 @@ jobs:
7373
steam-upload:
7474
name: Upload Steam Builds 🚂
7575
if: github.repository_owner == 'obsproject' && inputs.job == 'steam'
76-
runs-on: macos-15
76+
runs-on: macos-26
7777
steps:
7878
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7979
- uses: ./.github/actions/steam-upload

.github/workflows/publish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ jobs:
230230
name: Upload Steam Builds 🚂
231231
needs: check-tag
232232
if: github.repository_owner == 'obsproject' && fromJSON(needs.check-tag.outputs.validTag)
233-
runs-on: macos-15
233+
runs-on: macos-26
234234
steps:
235235
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
236236
- uses: ./.github/actions/steam-upload

.github/workflows/push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
create-appcast:
140140
name: Create Sparkle Appcast 🎙️
141141
if: github.repository_owner == 'obsproject' && github.ref_type == 'tag'
142-
runs-on: macos-15
142+
runs-on: macos-26
143143
needs: build-project
144144
strategy:
145145
fail-fast: false

.github/workflows/scheduled.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
services-availability:
1414
name: Check Service Availability 🛜
1515
if: github.repository_owner == 'obsproject'
16-
runs-on: macos-15
16+
runs-on: macos-26
1717
permissions:
1818
checks: write
1919
contents: write
@@ -22,8 +22,6 @@ jobs:
2222
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2323
with:
2424
fetch-depth: 0
25-
- name: Set Up Homebrew 🍺
26-
uses: Homebrew/actions/setup-homebrew@8eb7f2efa6ab636da09aef605b497fd5b8a7587d
2725
- name: Check for Defunct Services 📉
2826
uses: ./.github/actions/services-validator
2927
with:
@@ -163,7 +161,7 @@ jobs:
163161
name: Upload Steam Builds 🚂
164162
needs: [build-project]
165163
if: github.repository_owner == 'obsproject'
166-
runs-on: macos-15
164+
runs-on: macos-26
167165
defaults:
168166
run:
169167
shell: zsh --no-rcs --errexit --pipefail {0}

0 commit comments

Comments
 (0)