Skip to content

Commit 56b8784

Browse files
authored
Merge pull request secondlife#8 from AlchemyViewer/alchemy-upd
Alchemy upd
2 parents 009a262 + 6bce45d commit 56b8784

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
fetch-depth: 0
151151
submodules: recursive
152152
- name: Download webrtc artifacts
153-
uses: actions/download-artifact@v5
153+
uses: actions/download-artifact@v4
154154
with:
155155
path: _packages
156156
- uses: AlchemyViewer/action-autobuild@v5
@@ -174,7 +174,7 @@ jobs:
174174
fetch-depth: 0
175175
submodules: recursive
176176
- name: Download webrtc artifacts
177-
uses: actions/download-artifact@v5
177+
uses: actions/download-artifact@v4
178178
with:
179179
path: _packages
180180
- uses: AlchemyViewer/action-autobuild@v5
@@ -198,7 +198,7 @@ jobs:
198198
fetch-depth: 0
199199
submodules: recursive
200200
- name: Download webrtc artifacts
201-
uses: actions/download-artifact@v5
201+
uses: actions/download-artifact@v4
202202
with:
203203
path: _packages
204204
- uses: AlchemyViewer/action-autobuild@v5

build/VERSION

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
WEBRTC_BUILD_VERSION=137.7151.03.0
2-
WEBRTC_VERSION=137.7151.03
3-
WEBRTC_READABLE_VERSION=M137.7151@{#3}
4-
WEBRTC_COMMIT=8538ce3b1ac15f0a1beeb5ef7c9368b73d2c0c92
1+
WEBRTC_BUILD_VERSION=137.7151.07.0
2+
WEBRTC_VERSION=137.7151.07
3+
WEBRTC_READABLE_VERSION=M137.7151@{#7}
4+
WEBRTC_COMMIT=f4967efc183c371ff984632f8909ba022ee275cd

build/run.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ def get_webrtc(source_dir, patch_dir, version, target,
374374
cmd(['git', 'branch'])
375375
cmd(['git', 'checkout', '-f', version])
376376
cmd(['git', 'clean', '-df'])
377-
cmd(['gclient', 'sync', '-D', '--force', '--reset', '--no-history', '--jobs=8'])
377+
cmd(['gclient', 'sync', '-D', '--force', '--reset', '--revision', version, '--no-history', '--jobs=8'])
378378
for patch in PATCHES[target]:
379379
depth, dirs = PATCH_INFO.get(patch, (1, ['.']))
380380
dir = os.path.join(src_dir, *dirs)
@@ -752,7 +752,8 @@ def build_webrtc(
752752
f'target_cpu="{target_cpus[target]}"',
753753
"use_custom_libcxx=false",
754754
"use_custom_libcxx_for_host=false",
755-
"is_clang=true"
755+
"is_clang=true",
756+
'use_lld=false',
756757
]
757758
elif target in ('macos_x86_64', 'macos_arm64'):
758759
gn_args += [
@@ -1218,7 +1219,7 @@ def main():
12181219
commit = version_info.webrtc_commit
12191220
if args.commit:
12201221
commit = args.commit
1221-
1222+
12221223
print("Building for commit: ", commit)
12231224

12241225
# ソース取得

0 commit comments

Comments
 (0)